diff --git a/lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart
index 2cca395ab..a4eb3d386 100644
--- a/lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart
+++ b/lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart
@@ -105,15 +105,13 @@ abstract class WalletAddressEditOrCreateViewModelBase with Store {
         await monero!.getSubaddressList(wallet).setLabelSubaddress(wallet,
             accountIndex: monero!.getCurrentAccount(wallet).id, addressIndex: index, label: label);
         await wallet.save();
-        return;
       }
       if (wallet.type == WalletType.haven) {
         await haven!.getSubaddressList(wallet).setLabelSubaddress(wallet,
             accountIndex: haven!.getCurrentAccount(wallet).id,
-            addressIndex: _item?.id as int,
+            addressIndex: index,
             label: label);
         await wallet.save();
-        return;
       }
     }
   }