diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 03392a8c79..0c161d6642 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -337,7 +337,7 @@ export function uploadCompose(files) {
         if (status === 200) {
           dispatch(uploadComposeSuccess(data, file));
 
-          if (defaultSensitive && !spoiler) {
+          if (defaultSensitive && !spoiler && (media.size + i) === 0) {
             dispatch(changeComposeSpoilerness());
           }
         } else if (status === 202) {