diff --git a/src/ios/AppDelegate+FCMPlugin.m b/src/ios/AppDelegate+FCMPlugin.m
index 4261b1604..204d016ca 100644
--- a/src/ios/AppDelegate+FCMPlugin.m
+++ b/src/ios/AppDelegate+FCMPlugin.m
@@ -95,7 +95,9 @@ - (BOOL)application:(UIApplication *)application customDidFinishLaunchingWithOpt
     }
 
     // [START configure_firebase]
-    [FIRApp configure];
+    if([FIRApp defaultApp] == nil)
+	[FIRApp configure];
+    
     // [END configure_firebase]
     // Add observer for InstanceID token refresh callback.
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tokenRefreshNotification:)
@@ -223,8 +225,8 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
     //                              foreground (user taps notification)
 
     UIApplicationState state = application.applicationState;
-    if (application.applicationState == UIApplicationStateActive
-        || application.applicationState == UIApplicationStateInactive) {
+    if (state == UIApplicationStateActive
+        || state == UIApplicationStateInactive) {
         [userInfoMutable setValue:@(NO) forKey:@"wasTapped"];
         NSLog(@"app active");
         NSData *jsonData = [NSJSONSerialization dataWithJSONObject:userInfoMutable