diff --git a/web/chat/chat-input-bar.react.js b/web/chat/chat-input-bar.react.js
--- a/web/chat/chat-input-bar.react.js
+++ b/web/chat/chat-input-bar.react.js
@@ -365,11 +365,12 @@
       this.dispatchTextMessageAction(text, nextLocalID);
       nextLocalID++;
     }
-
-    this.props.inputState.createMultimediaMessage(
-      nextLocalID,
-      this.props.threadInfo,
-    );
+    if (this.props.inputState.pendingUploads.length > 0) {
+      this.props.inputState.createMultimediaMessage(
+        nextLocalID,
+        this.props.threadInfo,
+      );
+    }
   }
 
   dispatchTextMessageAction(text: string, nextLocalID: number) {