diff --git a/Tusker/Views/Status/StatusContentContainer.swift b/Tusker/Views/Status/StatusContentContainer.swift
index 06dcf917..842e2e0a 100644
--- a/Tusker/Views/Status/StatusContentContainer.swift
+++ b/Tusker/Views/Status/StatusContentContainer.swift
@@ -130,11 +130,12 @@ class StatusContentContainer<ContentView: ContentTextView, PollView: StatusConte
         }
         isCollapsed = collapsed
         
-        // ensure that we have a lastSubviewBottomConstraint
-        updateConstraintsIfNeeded()
-        // force unwrap because the content container should always have at least one view
-        lastSubviewBottomConstraint!.isActive = !collapsed
-        zeroHeightConstraint.isActive = collapsed
+        // don't call setNeedsUpdateConstraints b/c that destroys/recreates a bunch of other constraints
+        // if there is no lastSubviewBottomConstraint, then we already need a constraint update, so we don't need to do anything here
+        if let lastSubviewBottomConstraint {
+            lastSubviewBottomConstraint.isActive = !collapsed
+            zeroHeightConstraint.isActive = collapsed
+        }
     }
     
     // used only for collapsing automatically based on height, doesn't need to be accurate