diff --git a/app/models/post.rb b/app/models/post.rb
index 5095f463882..6d97f5ee340 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1035,7 +1035,7 @@ class Post < ActiveRecord::Base
   end
 
   def update_uploads_secure_status(source:)
-    if Discourse.store.external?
+    if Discourse.store.external? && SiteSetting.secure_uploads?
       Jobs.enqueue(:update_post_uploads_secure_status, post_id: self.id, source: source)
     end
   end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 2ce5a51307d..f0a9c92eb0b 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -190,7 +190,7 @@ class PostCreator
         update_user_counts
         create_embedded_topic
         @post.link_post_uploads
-        update_uploads_secure_status
+        @post.update_uploads_secure_status(source: "post creator")
         delete_owned_bookmarks
         ensure_in_allowed_users if guardian.is_staff?
         unarchive_message if !@opts[:import_mode]
@@ -402,10 +402,6 @@ class PostCreator
     rollback_from_errors!(embed) unless embed.save
   end
 
-  def update_uploads_secure_status
-    @post.update_uploads_secure_status(source: "post creator") if SiteSetting.secure_uploads?
-  end
-
   def delete_owned_bookmarks
     return if !@post.topic_id
     BookmarkManager.new(@user).destroy_for_topic(