diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
index 08b95207d..2fade8a45 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
@@ -560,7 +560,7 @@ public class ComposeMediaViewController{
 
 	public boolean areAllAttachmentsImages(){
 		for(DraftMediaAttachment att:attachments){
-			if((att.mimeType==null && att.serverAttachment.type==Attachment.Type.IMAGE) || !att.mimeType.startsWith("image/"))
+			if((att.mimeType==null && att.serverAttachment.type==Attachment.Type.IMAGE) || (att.mimeType!=null && !att.mimeType.startsWith("image/")))
 				return false;
 		}
 		return true;