diff --git a/lib/view_model/wallet_creation_vm.dart b/lib/view_model/wallet_creation_vm.dart
index 7338db5f6..a8b71b975 100644
--- a/lib/view_model/wallet_creation_vm.dart
+++ b/lib/view_model/wallet_creation_vm.dart
@@ -17,7 +17,6 @@ import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_credentials.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_type.dart';
-import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:polyseed/polyseed.dart';
 
@@ -94,7 +93,7 @@ abstract class WalletCreationVMBase with Store {
       final diId = await di!.save();
       credentials.derivationInfo = di;
 
-      final walletInfo = WalletInfo.external(
+      credentials.walletInfo = WalletInfo.external(
         id: WalletBase.idFor(name, type),
         name: name,
         type: type,
@@ -109,16 +108,14 @@ abstract class WalletCreationVMBase with Store {
         hardwareWalletType: credentials.hardwareWalletType,
       );
 
-      credentials.walletInfo = walletInfo;
-      // await walletInfo.save();
-      printV("derivationInfo: ${(await walletInfo.getDerivationInfo()).toJson()}");
+      printV("derivationInfo: ${(await credentials.walletInfo!.getDerivationInfo()).toJson()}");
       final wallet = await process(credentials);
 
       final isNonSeedWallet = isRecovery ? wallet.seed == null : false;
-      walletInfo.isNonSeedWallet = isNonSeedWallet;
-      walletInfo.hashedWalletIdentifier = createHashedWalletIdentifier(wallet);
-      walletInfo.address = wallet.walletAddresses.address;
-      await walletInfo.save();
+      credentials.walletInfo!.isNonSeedWallet = isNonSeedWallet;
+      credentials.walletInfo!.hashedWalletIdentifier = createHashedWalletIdentifier(wallet);
+      credentials.walletInfo!.address = wallet.walletAddresses.address;
+      await credentials.walletInfo!.save();
       await _appStore.changeCurrentWallet(wallet);
       _appStore.authenticationStore.allowedCreate();
       state = ExecutedSuccessfullyState();