diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 421acdd87a..eb53ed782f 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -343,6 +343,7 @@ void uncaughtExceptionHandler(NSException *exception)
     [AppVersion shared];
 
     self.window = [OWSWindow new];
+    CurrentAppContext().mainWindow = self.window;
 
     // Show the launch screen
     UIViewController *viewController = [[UIStoryboard storyboardWithName:@"Launch Screen"