diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileHeader.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileHeader.kt
index 298ed1e1a..12374a735 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileHeader.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileHeader.kt
@@ -50,7 +50,7 @@ fun FileHeaderDisplay(
             val hash = event.hash()
             val dimensions = event.dimensions()
             val description = event.content.ifEmpty { null } ?: event.alt()
-            val isImage = RichTextParser.isImageUrl(fullUrl)
+            val isImage = event.mimeType()?.startsWith("image/") == true || RichTextParser.isImageUrl(fullUrl)
             val uri = note.toNostrUri()
 
             mutableStateOf<BaseMediaContent>(
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt
index c779b561f..563bb12c8 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt
@@ -85,7 +85,7 @@ fun VideoDisplay(
             val hash = event.hash()
             val dimensions = event.dimensions()
             val description = event.content.ifBlank { null } ?: event.alt()
-            val isImage = RichTextParser.isImageUrl(fullUrl)
+            val isImage = event.mimeType()?.startsWith("image/") == true || RichTextParser.isImageUrl(fullUrl)
             val uri = note.toNostrUri()
 
             mutableStateOf<BaseMediaContent>(