diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 5a333e2f9..549c00a1f 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -946,6 +946,11 @@ static NSTimeInterval launchStartedAt;
 - (UIInterfaceOrientationMask)application:(UIApplication *)application
     supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window
 {
+    if (self.windowManager.hasCall) {
+        // The call-banner window is only suitable for portrait display
+        return UIInterfaceOrientationMaskPortrait;
+    }
+    
     if (!window) {
         // If `window` is nil, be permissive.  Otherwise orientation
         // gets messed up during presentation of windows.
@@ -960,11 +965,6 @@ static NSTimeInterval launchStartedAt;
         return UIInterfaceOrientationMaskPortrait;
     }
 
-    if (self.windowManager.hasCall) {
-        // The call-banner window is only suitable for portrait display
-        return UIInterfaceOrientationMaskPortrait;
-    }
-
     return UIInterfaceOrientationMaskAllButUpsideDown;
 }
 
diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
index d6d920b5d..c2a9f5f1a 100644
--- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
@@ -540,6 +540,13 @@ typedef void (^CustomLayoutBlock)(void);
     [self updateVerificationStateLabel];
 }
 
+#pragma mark - Orientation
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations
+{
+    return UIInterfaceOrientationMaskPortrait;
+}
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
index 3a927d125..b8be8a4b6 100644
--- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
@@ -246,6 +246,13 @@ NS_ASSUME_NONNULL_BEGIN
     [super dismissViewControllerAnimated:animated completion:completion];
 }
 
+#pragma mark - Orientation
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations
+{
+    return UIInterfaceOrientationMaskPortrait;
+}
+
 @end
 
 NS_ASSUME_NONNULL_END