diff --git a/Application/AppController.m b/Application/AppController.m
index 8c0a2f747..3362b5ae2 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -29,6 +29,8 @@
 
 #import <Sparkle/Sparkle.h>
 
+@import Firebase;
+
 void *kAppControllerContext = &kAppControllerContext;
 
 @implementation AppController {
@@ -141,6 +143,9 @@ void *kAppControllerContext = &kAppControllerContext;
 }
 
 - (void)awakeFromNib {
+	[[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"NSApplicationCrashOnExceptions": @(YES) }];
+	[FIRApp configure];
+
 #ifdef DEBUG
 	// Prevent updates automatically in debug builds
 	[updater setAutomaticallyChecksForUpdates:NO];
diff --git a/Application/MediaKeysApplication.m b/Application/MediaKeysApplication.m
index 569b1f4e1..ab0befa25 100644
--- a/Application/MediaKeysApplication.m
+++ b/Application/MediaKeysApplication.m
@@ -16,8 +16,6 @@
 #import <MediaPlayer/MPRemoteCommandCenter.h>
 #import <MediaPlayer/MPRemoteCommandEvent.h>
 
-@import Firebase;
-
 @implementation MediaKeysApplication {
 	AppController *_appController;
 }
@@ -26,9 +24,6 @@
 	[super finishLaunching];
 	_appController = (AppController *)[self delegate];
 
-	[[NSUserDefaults standardUserDefaults] registerDefaults:@{@"NSApplicationCrashOnExceptions" : @(YES)}];
-	[FIRApp configure];
-
 	MPRemoteCommandCenter *remoteCommandCenter = [MPRemoteCommandCenter sharedCommandCenter];
 
 	[remoteCommandCenter.playCommand setEnabled:YES];