diff --git a/Tusker/Screens/Compose/ComposeReplyView.swift b/Tusker/Screens/Compose/ComposeReplyView.swift
index 81697a0f6d..92ac9d70f5 100644
--- a/Tusker/Screens/Compose/ComposeReplyView.swift
+++ b/Tusker/Screens/Compose/ComposeReplyView.swift
@@ -41,11 +41,10 @@ struct ComposeReplyView: View {
                 ComposeReplyContentView(status: status) { (newHeight) in
                     self.contentHeight = newHeight
                 }
-                    .frame(height: contentHeight)
                     .offset(x: -4, y: -8)
                     .padding(.bottom, -8)
             }
-            .frame(minHeight: 50 + 8)
+            .frame(height: max(50, contentHeight ?? 0) + 8)
         }
         .padding(.bottom, -8)
     }