diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
index efca0d5e81d88eaba9c013c13687ecfc196b947f..b5aa4ff4322c9c850df90012dd1142ae7176cd1b 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -58,12 +58,16 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
     @ReactMethod
     public void getInitialNotification(Promise promise){
         Activity activity = getCurrentActivity();
+        if(activity == null){
+            promise.resolve(null);
+            return;
+        }
         Intent intent = activity.getIntent();
-        if(activity == null || (intent.getAction() != null && intent.getAction().equals("android.intent.action.MAIN"))){
+        if(intent.getAction() != null && intent.getAction().equals("android.intent.action.MAIN")){
             promise.resolve(null);
             return;
         }
-        promise.resolve(parseIntent(activity.getIntent()));
+        promise.resolve(parseIntent(intent));
     }
     
     @ReactMethod