diff --git a/app/src/main/java/com/keylesspalace/tusky/util/AttachmentHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/AttachmentHelper.kt
index 287e3e774..7f5eb24b1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/AttachmentHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/AttachmentHelper.kt
@@ -28,7 +28,9 @@ fun List<Attachment>.aspectRatios(): List<Double> {
     return map { attachment ->
         // clamp ratio between 2:1 & 1:2, defaulting to 16:9
         val size = (attachment.meta?.small ?: attachment.meta?.original) ?: return@map 1.7778
-        val aspect = if (size.aspect > 0) size.aspect else size.width.toDouble() / size.height
+        if (size.aspect > 0) return@map size.aspect
+        if (size.width == 0 || size.height == 0) return@map 1.7778
+        val aspect = size.width.toDouble() / size.height
         aspect.coerceIn(0.5, 2.0)
     }
 }