diff --git a/src/lib/components/channel/MessageInput.svelte b/src/lib/components/channel/MessageInput.svelte
index 488683da19..3e7c092a75 100644
--- a/src/lib/components/channel/MessageInput.svelte
+++ b/src/lib/components/channel/MessageInput.svelte
@@ -925,7 +925,7 @@
 														}
 
 														// Submit the content when Enter key is pressed
-														if (content !== '' && e.keyCode === 13 && !e.shiftKey) {
+														if ((content !== '' || files.length > 0) && e.keyCode === 13 && !e.shiftKey) {
 															submitHandler();
 														}
 													}