diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/ContentType.java b/mastodon/src/main/java/org/joinmastodon/android/model/ContentType.java
index 4dc7fd1c7..24f1d4161 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/ContentType.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/ContentType.java
@@ -34,8 +34,6 @@ public enum ContentType {
 	}
 
 	public boolean supportedByInstance(Instance i) {
-		if(i.isIceshrimp())
-			return this==MISSKEY_MARKDOWN || this==UNSPECIFIED;
-		return i.isAkkoma() || (this!=BBCODE && this!=MISSKEY_MARKDOWN);
+		return i.isAkkoma() || i.isIceshrimp() || (this!=BBCODE && this!=MISSKEY_MARKDOWN);
 	}
 }