diff --git a/Tusker/Views/Attachments/AttachmentsContainerView.swift b/Tusker/Views/Attachments/AttachmentsContainerView.swift
index eb60dce2..22d4b9f6 100644
--- a/Tusker/Views/Attachments/AttachmentsContainerView.swift
+++ b/Tusker/Views/Attachments/AttachmentsContainerView.swift
@@ -295,7 +295,11 @@ class AttachmentsContainerView: UIView {
                 accessibilityElements.append(moreView)
             }
             
-            self.aspectRatio = aspectRatio
+            self.aspectRatio = if aspectRatio.isNaN || aspectRatio.isInfinite {
+                16/9
+            } else {
+                aspectRatio
+            }
         } else {
             self.isHidden = true
         }