diff --git a/SignalMessaging/ViewControllers/OWSNavigationController.m b/SignalMessaging/ViewControllers/OWSNavigationController.m
index 2237bf7cb..f89869278 100644
--- a/SignalMessaging/ViewControllers/OWSNavigationController.m
+++ b/SignalMessaging/ViewControllers/OWSNavigationController.m
@@ -205,21 +205,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - Orientation
 
+- (BOOL)shouldAutorotate
+{
+    return NO;
+}
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
-    if (self.visibleViewController) {
-        if (@available(iOS 10, *)) {
-            // do nothing
-        } else {
-            // Avoid crash in SAE on iOS9
-            if (!CurrentAppContext().isMainApp) {
-                return UIInterfaceOrientationMaskAllButUpsideDown;
-            }
-        }
-        return self.visibleViewController.supportedInterfaceOrientations;
-    } else {
-        return UIInterfaceOrientationMaskAllButUpsideDown;
-    }
+    return UIInterfaceOrientationMaskPortrait;
 }
 
 @end