diff --git a/Firebase/Database/Api/FIRDatabase.m b/Firebase/Database/Api/FIRDatabase.m
index 1fd25d5cb53..2dd77f6e135 100644
--- a/Firebase/Database/Api/FIRDatabase.m
+++ b/Firebase/Database/Api/FIRDatabase.m
@@ -54,10 +54,12 @@ + (void)load {
       NSMutableDictionary *instances = [self instances];
       @synchronized (instances) {
           FIRDatabase *deletedApp = instances[appName];
-          // Clean up the deleted instance in an effort to remove any resources still in use.
-          // Note: Any leftover instances of this exact database will be invalid.
-          [FRepoManager disposeRepos:deletedApp.config];
-          [instances removeObjectForKey:appName];
+          if (deletedApp) {
+              // Clean up the deleted instance in an effort to remove any resources still in use.
+              // Note: Any leftover instances of this exact database will be invalid.
+              [FRepoManager disposeRepos:deletedApp.config];
+              [instances removeObjectForKey:appName];
+          }
       }
   }];
 }