diff --git a/Delta/AppDelegate.swift b/Delta/AppDelegate.swift
index ef0cc53..24916e4 100644
--- a/Delta/AppDelegate.swift
+++ b/Delta/AppDelegate.swift
@@ -20,9 +20,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate
         self.window?.tintColor = UIColor.deltaPurpleColor()
         
         // Database
+        
+        let semaphore = dispatch_semaphore_create(0)
+        
         DatabaseManager.sharedManager.startWithCompletion { performingMigration in
+            dispatch_semaphore_signal(semaphore)
         }
         
+        dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER)
+        
         // Controllers
         ExternalControllerManager.sharedManager.startMonitoringExternalControllers()