diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 97c552c1ff..43a387d1cc 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -65,7 +65,11 @@ class PostStatusService < BaseService
   private
 
   def preprocess_attributes!
-    @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
+    @sensitive    = (if @options[:sensitive].nil?
+                       @media.any? ? @account.user&.setting_default_sensitive : false
+                     else
+                       @options[:sensitive]
+                     end) || @options[:spoiler_text].present?
     @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
     @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
     @visibility   = :unlisted if (@visibility&.to_sym == :public || @visibility&.to_sym == :public_unlisted) && @account.silenced?