diff --git a/SessionUIKit/Utilities/SwiftUI+Utilities.swift b/SessionUIKit/Utilities/SwiftUI+Utilities.swift
index 260a6429d..70d7d39b0 100644
--- a/SessionUIKit/Utilities/SwiftUI+Utilities.swift
+++ b/SessionUIKit/Utilities/SwiftUI+Utilities.swift
@@ -10,7 +10,9 @@ struct ViewControllerHolder {
 
 struct ViewControllerKey: EnvironmentKey {
     static var defaultValue: ViewControllerHolder {
-        return ViewControllerHolder(value: CurrentAppContext().mainWindow?.rootViewController)
+        return ViewControllerHolder(
+            value: HasAppContext() ? CurrentAppContext().mainWindow?.rootViewController : nil
+        )
     }
 }