diff --git a/internal_packages/message-list/lib/message-item.cjsx b/internal_packages/message-list/lib/message-item.cjsx
index 3101ea85f..f5a0c733d 100644
--- a/internal_packages/message-list/lib/message-item.cjsx
+++ b/internal_packages/message-list/lib/message-item.cjsx
@@ -105,7 +105,8 @@ MessageItem = React.createClass
 
   _attachmentComponents: ->
     AttachmentComponent = @state.AttachmentComponent
-    attachments = _.filter @props.message.files, (f) -> not f.contentId?
+    attachments = _.filter @props.message.files, (f) ->
+      not f.contentId? and f.filename.length > 0
     attachments.map (file) =>
       <AttachmentComponent file={file} key={file.id} download={@state.downloads[file.id]}/>