diff --git a/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart b/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart
index 58196fe7..5904d2a4 100644
--- a/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart
+++ b/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart
@@ -44,6 +44,8 @@ class AuthenticationRepositoryImpl<T extends Object>
 
   final OnAuthChange<T>? _onAccountChanges;
 
+  bool _pause = false; // Semaphore
+
   AuthenticationRepositoryImpl({
     required AuthenticationCacheDataSource<T> authenticationCacheDataSource,
     required AuthenticationRemoteDataSource authenticationRemoteDataSource,
@@ -120,6 +122,7 @@ class AuthenticationRepositoryImpl<T extends Object>
   }) =>
       Result.tryCatchAsync<Account, AppException, AppException>(
         () async {
+          _pause = true;
           final account = await _authenticationRemoteDataSource.signUp(
             email: email,
             password: password,
@@ -135,9 +138,13 @@ class AuthenticationRepositoryImpl<T extends Object>
               (error) async => error,
             );
           }
+          _pause = false;
           return account;
         },
-        (error) => error,
+        (error) {
+          _pause = false;
+          return error;
+        },
       );
 
   @override
@@ -200,7 +207,7 @@ class AuthenticationRepositoryImpl<T extends Object>
   @override
   Stream<FutureResult<AccountWrapper<T>>> streamAccount() =>
       _authenticationRemoteDataSource.streamAccount().map((account) async {
-        if (_onAccountChanges.isNotNull) {
+        if (_onAccountChanges.isNotNull && !_pause) {
           final dataResult = await _onAccountChanges!.call(account);
           return dataResult.map((data) => AccountWrapperModel(account, data));
         }