diff --git a/lib/modules/auth/index.js b/lib/modules/auth/index.js
index b04cd89a..52b7a4af 100644
--- a/lib/modules/auth/index.js
+++ b/lib/modules/auth/index.js
@@ -42,12 +42,7 @@ export default class Auth extends Base {
     if (auth && auth.user && !this._user) this._user = new User(this, auth);
     else if ((!auth || !auth.user) && this._user) this._user = null;
     else if (this._user) this._user._updateValues(auth);
-    if (emit) {
-      this.emit(
-        'onAuthStateChanged',
-        this._authResult && this._authResult.user || null
-      );
-    }
+    if (emit) this.emit('onAuthStateChanged', this._user);
     return auth ? this._user : null;
   }