diff --git a/package.json b/package.json
index a7cc2f042..0bf4f0227 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-firebasex",
-  "version": "16.5.1-hogangnono",
+  "version": "16.5.2-hogangnono",
   "description": "Cordova plugin for Google Firebase",
   "types": "./types/index.d.ts",
   "author": {
diff --git a/plugin.xml b/plugin.xml
index af7be0a41..2b1e8814f 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-firebasex" version="16.5.1-hogangnono"
+<plugin id="cordova-plugin-firebasex" version="16.5.2-hogangnono"
 	xmlns="http://apache.org/cordova/ns/plugins/1.0"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
diff --git a/src/android/FirebasePlugin.java b/src/android/FirebasePlugin.java
index 96fdb9f54..9584c6955 100755
--- a/src/android/FirebasePlugin.java
+++ b/src/android/FirebasePlugin.java
@@ -4042,28 +4042,30 @@ private static class IdTokenListener implements FirebaseAuth.IdTokenListener {
         public void onIdTokenChanged(@NonNull FirebaseAuth firebaseAuth) {
             try {
                 FirebaseUser user = firebaseAuth.getCurrentUser();
-                user.getIdToken(true).addOnSuccessListener(new OnSuccessListener<GetTokenResult>() {
-                    @Override
-                    public void onSuccess(GetTokenResult result) {
-                        try {
-                            String idToken = result.getToken();
-                            if (idToken != null && idToken.equals(instance.currentIdToken)) {
-                                return;
+                if (user != null) {
+                    user.getIdToken(true).addOnSuccessListener(new OnSuccessListener<GetTokenResult>() {
+                        @Override
+                        public void onSuccess(GetTokenResult result) {
+                            try {
+                                String idToken = result.getToken();
+                                if (idToken != null && idToken.equals(instance.currentIdToken)) {
+                                    return;
+                                }
+                                instance.currentIdToken = idToken;
+                                String providerId = result.getSignInProvider();
+                                FirebasePlugin.instance.executeGlobalJavascript(JS_GLOBAL_NAMESPACE + "_onAuthIdTokenChange({\"idToken\":\"" + idToken + "\",\"providerId\":\"" + providerId + "\"})");
+                            } catch (Exception e) {
+                                FirebasePlugin.instance.executeGlobalJavascript(JS_GLOBAL_NAMESPACE + "_onAuthIdTokenChange()");
                             }
-                            instance.currentIdToken = idToken;
-                            String providerId = result.getSignInProvider();
-                            FirebasePlugin.instance.executeGlobalJavascript(JS_GLOBAL_NAMESPACE + "_onAuthIdTokenChange({\"idToken\":\"" + idToken + "\",\"providerId\":\"" + providerId + "\"})");
-                        } catch (Exception e) {
-                            FirebasePlugin.instance.executeGlobalJavascript(JS_GLOBAL_NAMESPACE + "_onAuthIdTokenChange()");
                         }
-                    }
 
-                }).addOnFailureListener(new OnFailureListener() {
-                    @Override
-                    public void onFailure(@NonNull Exception e) {
-                        FirebasePlugin.instance.executeGlobalJavascript(JS_GLOBAL_NAMESPACE + "_onAuthIdTokenChange()");
-                    }
-                });
+                    }).addOnFailureListener(new OnFailureListener() {
+                        @Override
+                        public void onFailure(@NonNull Exception e) {
+                            FirebasePlugin.instance.executeGlobalJavascript(JS_GLOBAL_NAMESPACE + "_onAuthIdTokenChange()");
+                        }
+                    });
+                }
             } catch (Exception e) {
                 handleExceptionWithoutContext(e);
             }