diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m
index bc956aa4b4d..ca61abf823e 100644
--- a/Firebase/Core/FIRApp.m
+++ b/Firebase/Core/FIRApp.m
@@ -178,12 +178,12 @@ + (void)configureWithName:(NSString *)name options:(FIROptions *)options {
 
   @synchronized(self) {
     FIRApp *app = [[FIRApp alloc] initInstanceWithName:name options:options];
-    [FIRApp addAppToAppDictionary:app];
-    [FIRApp sendNotificationsToSDKs:app];
-
     if (app.isDefaultApp) {
       sDefaultApp = app;
     }
+
+    [FIRApp addAppToAppDictionary:app];
+    [FIRApp sendNotificationsToSDKs:app];
   }
 }