diff --git a/Tusker/Views/Attachments/AttachmentsContainerView.swift b/Tusker/Views/Attachments/AttachmentsContainerView.swift
index 662e38f6..bd449c9b 100644
--- a/Tusker/Views/Attachments/AttachmentsContainerView.swift
+++ b/Tusker/Views/Attachments/AttachmentsContainerView.swift
@@ -101,7 +101,8 @@ class AttachmentsContainerView: UIView {
                 accessibilityElements.append(attachmentView)
                 if Preferences.shared.showUncroppedMediaInline,
                    let attachmentAspectRatio = attachmentView.attachmentAspectRatio {
-                    aspectRatio = attachmentAspectRatio
+                    // clamp to prevent excessively short/tall attachments
+                    aspectRatio = max(min(attachmentAspectRatio, 2/1), 1/2)
                 }
             case 2:
                 let left = createAttachmentView(index: 0, hSize: .half, vSize: .full)