diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
index e9ec2bf..9f1372a 100644
--- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
+++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
@@ -68,7 +68,7 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
         WritableMap msgMap = Arguments.createMap();
         msgMap.putString("eventName", "listenForAuth");
 
-        if (FirestackAuthModule.this.user != null) {
+        if (firebaseAuth.getCurrentUser() != null) {
             WritableMap userMap = getUserMap();
 
             msgMap.putBoolean("authenticated", true);