diff --git a/Clocker/AppDelegate.swift b/Clocker/AppDelegate.swift
index a2b2a0d..2f3a1cd 100644
--- a/Clocker/AppDelegate.swift
+++ b/Clocker/AppDelegate.swift
@@ -88,16 +88,20 @@ open class AppDelegate: NSObject, NSApplicationDelegate {
         NSApp.setActivationPolicy(.accessory)
     }
 
-    private lazy var controller: OnboardingController? = {
-        let onboardingStoryboard = NSStoryboard(name: NSStoryboard.Name("Onboarding"), bundle: nil)
-        return onboardingStoryboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier("onboardingFlow")) as? OnboardingController
-    }()
-
+    private var controller: OnboardingController?
+    
     private func showOnboardingFlowIfEligible() {
-        let shouldLaunchOnboarding = (DataStore.shared().retrieve(key: CLShowOnboardingFlow) == nil && DataStore.shared().timezones().isEmpty)
-            || ProcessInfo.processInfo.arguments.contains(CLOnboaringTestsLaunchArgument)
-
-        shouldLaunchOnboarding ? controller?.launch() : continueUsually()
+        let shouldLaunchOnboarding = (DataStore.shared().retrieve(key: CLShowOnboardingFlow) == nil
+                                      && DataStore.shared().timezones().isEmpty)
+        || ProcessInfo.processInfo.arguments.contains(CLOnboaringTestsLaunchArgument)
+
+        if (shouldLaunchOnboarding) {
+            let onboardingStoryboard = NSStoryboard(name: NSStoryboard.Name("Onboarding"), bundle: nil)
+            controller = onboardingStoryboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier("onboardingFlow")) as? OnboardingController
+            controller?.launch()
+        } else {
+            continueUsually()
+        }
     }
 
     func continueUsually() {