diff --git a/packages/firebase_auth/firebase_auth_web/lib/firebase_auth_web.dart b/packages/firebase_auth/firebase_auth_web/lib/firebase_auth_web.dart
index 5ee8031d52ac..7234322bd51e 100644
--- a/packages/firebase_auth/firebase_auth_web/lib/firebase_auth_web.dart
+++ b/packages/firebase_auth/firebase_auth_web/lib/firebase_auth_web.dart
@@ -135,7 +135,7 @@ class FirebaseAuthWeb extends FirebaseAuthPlatform {
             );
           }
         }).listen((UserWeb? webUser) {
-          _authStateChangesListeners[app.name]!.add(webUser);
+          _authStateChangesListeners[app.name]?.add(webUser);
         });
         break;
       case StateListener.idTokenChange:
@@ -174,8 +174,8 @@ class FirebaseAuthWeb extends FirebaseAuthPlatform {
             );
           }
         }).listen((UserWeb? webUser) {
-          _idTokenChangesListeners[app.name]!.add(webUser);
-          _userChangesListeners[app.name]!.add(webUser);
+          _idTokenChangesListeners[app.name]?.add(webUser);
+          _userChangesListeners[app.name]?.add(webUser);
         });
         break;
       case StateListener.userStateChange: