diff --git a/lib/new-ui/pages/swap_page.dart b/lib/new-ui/pages/swap_page.dart
index b4719a85a..4f82a4eb1 100644
--- a/lib/new-ui/pages/swap_page.dart
+++ b/lib/new-ui/pages/swap_page.dart
@@ -429,8 +429,8 @@ class _NewSwapPageState extends State<NewSwapPage> {
     final parsedAddress = await widget.adrResService
         .resolve(query: domain, wallet: widget.exchangeViewModel.wallet, currency: currency);
     return parsedAddress.isNotEmpty
-        ? parsedAddress.first.parsedAddressByCurrencyMap[currency] ?? ''
-        : '';
+        ? (parsedAddress.first.parsedAddressByCurrencyMap[currency] ?? domain)
+        : domain;
   }
 
   void _showFeeAlert(BuildContext context) async {
diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart
index a0efa4733..713d316d7 100644
--- a/lib/src/screens/exchange/exchange_page.dart
+++ b/lib/src/screens/exchange/exchange_page.dart
@@ -659,8 +659,8 @@ class ExchangePage extends BasePage {
     final parsedAddresses = await adrResService.resolve(
         query: domain, wallet: exchangeViewModel.wallet, currency: currency);
     return parsedAddresses.isNotEmpty
-        ? parsedAddresses.first.parsedAddressByCurrencyMap[currency] ?? ''
-        : '';
+        ? (parsedAddresses.first.parsedAddressByCurrencyMap[currency] ?? domain)
+        : domain;
   }
 
   void _showFeeAlert(BuildContext context) async {
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 4d4226576..e3a035a38 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -14,15 +14,15 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="6.3.0"
-MONERO_COM_BUILD_NUMBER=4162
+MONERO_COM_VERSION="6.3.2"
+MONERO_COM_BUILD_NUMBER=4163
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="6.3.1"
-CAKEWALLET_BUILD_NUMBER=4417
+CAKEWALLET_VERSION="6.3.2"
+CAKEWALLET_BUILD_NUMBER=4418
 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 52796b532..2771e5dcc 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -12,13 +12,13 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="6.3.0"
-MONERO_COM_BUILD_NUMBER=168
+MONERO_COM_VERSION="6.3.2"
+MONERO_COM_BUILD_NUMBER=169
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="6.3.1"
-CAKEWALLET_BUILD_NUMBER=428
+CAKEWALLET_VERSION="6.3.2"
+CAKEWALLET_BUILD_NUMBER=429
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"