diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 36e270aa0f2..37935ac9bb4 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -304,7 +304,8 @@ Template.room.events
 					file: item.getAsFile()
 					name: 'Clipboard'
 
-		fileUpload files
+		if files.length > 0
+			fileUpload files
 
 	'keydown .input-message': (event) ->
 		Template.instance().chatMessages.keydown(@_id, event, Template.instance())