diff --git a/lib/entities/load_current_wallet.dart b/lib/entities/load_current_wallet.dart
index df23b5958..251fa88e2 100644
--- a/lib/entities/load_current_wallet.dart
+++ b/lib/entities/load_current_wallet.dart
@@ -1,5 +1,4 @@
 import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/entities/wallet_manager.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
@@ -18,6 +17,5 @@ Future<void> loadCurrentWallet({String? password}) async {
   final type = deserializeFromInt(typeRaw);
   final walletLoadingService = getIt.get<WalletLoadingService>();
   final wallet = await walletLoadingService.load(type, name, password: password);
-  await getIt.get<WalletManager>().ensureGroupHasHashedIdentifier(wallet);
   await appStore.changeCurrentWallet(wallet);
 }
diff --git a/lib/reactions/on_current_wallet_change.dart b/lib/reactions/on_current_wallet_change.dart
index f5f5b3d8a..6a0be67e9 100644
--- a/lib/reactions/on_current_wallet_change.dart
+++ b/lib/reactions/on_current_wallet_change.dart
@@ -61,6 +61,8 @@ void startCurrentWalletChangeReaction(
         return;
       }
 
+      await getIt.get<WalletManager>().ensureGroupHasHashedIdentifier(wallet);
+
       final node = settingsStore.getCurrentNode(wallet.type);
 
       startWalletSyncStatusChangeReaction(wallet, fiatConversionStore);