diff --git a/cw_core/lib/wallet_info.dart b/cw_core/lib/wallet_info.dart
index 130b8ff5f..66ed1e932 100644
--- a/cw_core/lib/wallet_info.dart
+++ b/cw_core/lib/wallet_info.dart
@@ -64,15 +64,15 @@ class WalletInfo extends HiveObject {
   Map<String, String>? addresses;
 
   @HiveField(11)
-  String yatEid;
+  String? yatEid;
 
   @HiveField(12)
-  String yatLastUsedAddressRaw;
+  String? yatLastUsedAddressRaw;
 
   @HiveField(13)
   bool? showIntroCakePayCard;
 
-  String get yatLastUsedAddress => yatLastUsedAddressRaw;
+  String get yatLastUsedAddress => yatLastUsedAddressRaw ?? '';
 
   set yatLastUsedAddress(String address) {
     yatLastUsedAddressRaw = address;