diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 686e154c..233f47f0 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -36,6 +36,7 @@ class Auth::SessionsController < Devise::SessionsController
   protected
 
   def find_user
+    User.connection.stick_to_master!
     if session[:otp_user_id]
       User.find(session[:otp_user_id])
     elsif user_params[:email]
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index ed818488..5edc67bd 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -151,7 +151,7 @@ class PostStatusService < BaseService
 
     raise GabSocial::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
 
-    # @account.media_attachments.connection.stick_to_master!
+    @account.media_attachments.connection.stick_to_master!
     @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
 
     hasVideoOrGif = @media.find(&:video?) || @media.find(&:gifv?)