diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 7359d8ec3ae..dd745d7c49f 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -375,7 +375,9 @@ class PostCreator
   end
 
   def update_uploads_secure_status
-    @post.update_uploads_secure_status
+    if SiteSetting.secure_media? || SiteSetting.prevent_anons_from_downloading_files?
+      @post.update_uploads_secure_status
+    end
   end
 
   def handle_spam