diff --git a/cw_zcash/lib/src/zcash_wallet_addresses.dart b/cw_zcash/lib/src/zcash_wallet_addresses.dart
index 31bdbbf9e..42bd30423 100644
--- a/cw_zcash/lib/src/zcash_wallet_addresses.dart
+++ b/cw_zcash/lib/src/zcash_wallet_addresses.dart
@@ -108,7 +108,7 @@ abstract class ZcashWalletAddressesBase extends WalletAddresses with Store {
   Set<String> hiddenAddresses = {};
 
   Future<void> _initAddresses() async {
-    addressesMap = await walletInfo.getAddresses();
+    addressesMap = {};
     addressInfos = await walletInfo.getAddressInfos();
     usedAddresses = await walletInfo.getUsedAddresses();
     manualAddresses = await walletInfo.getManualAddresses();
@@ -236,7 +236,7 @@ abstract class ZcashWalletAddressesBase extends WalletAddresses with Store {
       if (!isPlaceholderAddress(address)) {
         walletInfo.address = address;
       }
-      await walletInfo.setAddresses(addressesMap);
+      await walletInfo.setAddresses({});
       await walletInfo.setAddressInfos(addressInfos);
       await walletInfo.setUsedAddresses(usedAddresses.toList());
       await walletInfo.setHiddenAddresses(hiddenAddresses.toList());
diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart
index ed1ae3154..2c08bd23c 100644
--- a/lib/src/screens/connect_device/connect_device_page.dart
+++ b/lib/src/screens/connect_device/connect_device_page.dart
@@ -42,7 +42,7 @@ class ConnectDevicePage extends BasePage {
   ConnectDevicePage(ConnectDevicePageParams params, this.hardwareWalletVM)
       : walletType = params.walletType,
         onConnectDevice = params.onConnectDevice,
-        allowChangeWallet = params.allowChangeWallet,
+        allowChangeWallet = params.allowChangeWallet || params.isReconnect,
         isReconnect = params.isReconnect;
   final WalletType walletType;
   final OnConnectDevice onConnectDevice;
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 014e2d49a..bba8c29e6 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -22,7 +22,7 @@ MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="6.3.0"
-CAKEWALLET_BUILD_NUMBER=4414
+CAKEWALLET_BUILD_NUMBER=4416
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index 4c0650f3d..c65c74115 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -18,7 +18,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="6.3.0"
-CAKEWALLET_BUILD_NUMBER=424
+CAKEWALLET_BUILD_NUMBER=426
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 
diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh
index 0a66f626c..b0cbb833e 100755
--- a/scripts/linux/app_env.sh
+++ b/scripts/linux/app_env.sh
@@ -14,8 +14,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="6.1.0"
-CAKEWALLET_BUILD_NUMBER=79
+CAKEWALLET_VERSION="6.3.0"
+CAKEWALLET_BUILD_NUMBER=80
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
     echo "Wrong app type."
diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
index 4d699307d..63e317798 100755
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
 fi
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="6.2.0"
-MONERO_COM_BUILD_NUMBER=80
+MONERO_COM_VERSION="6.3.0"
+MONERO_COM_BUILD_NUMBER=81
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="6.2.0"
-CAKEWALLET_BUILD_NUMBER=148
+CAKEWALLET_VERSION="6.3.0"
+CAKEWALLET_BUILD_NUMBER=149
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
diff --git a/scripts/windows/build_exe_installer.iss b/scripts/windows/build_exe_installer.iss
index d8fbc6e7e..9fba68e60 100644
--- a/scripts/windows/build_exe_installer.iss
+++ b/scripts/windows/build_exe_installer.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Cake Wallet"
-#define MyAppVersion "6.1.0"
+#define MyAppVersion "6.3.0"
 #define MyAppPublisher "Cake Labs LLC"
 #define MyAppURL "https://cakewallet.com/"
 #define MyAppExeName "CakeWallet.exe"