diff --git a/assets/ethereum_server_list.yml b/assets/ethereum_server_list.yml
index 965638471..ed425c3c7 100644
--- a/assets/ethereum_server_list.yml
+++ b/assets/ethereum_server_list.yml
@@ -1,5 +1,7 @@
 -
-  uri: ethereum.publicnode.com
+  uri: ethereum-rpc.publicnode.com
+  useSSL: true
+  isDefault: true
 -
   uri: eth.llamarpc.com
 -
diff --git a/assets/polygon_node_list.yml b/assets/polygon_node_list.yml
index 63878bc0c..3b2cdcdc3 100644
--- a/assets/polygon_node_list.yml
+++ b/assets/polygon_node_list.yml
@@ -1,7 +1,9 @@
 -
   uri: polygon-rpc.com
 -
-  uri: polygon-bor.publicnode.com
+  uri: polygon-bor-rpc.publicnode.com
+  useSSL: true
+  isDefault: true
 -
   uri: polygon.llamarpc.com
 -
diff --git a/cw_solana/lib/solana_client.dart b/cw_solana/lib/solana_client.dart
index 9447aad38..2207822bb 100644
--- a/cw_solana/lib/solana_client.dart
+++ b/cw_solana/lib/solana_client.dart
@@ -379,16 +379,18 @@ class SolanaWalletClient {
     required double solBalance,
     required double fee,
   }) async {
-    final rent =
-        await _client!.getMinimumBalanceForMintRentExemption(commitment: Commitment.confirmed);
-
-    final rentInSol = (rent / lamportsPerSol).toDouble();
-
-    final remnant = solBalance - (inputAmount + fee);
-
-    if (remnant > rentInSol) return true;
-
-    return false;
+    return true;
+    // TODO: this is not doing what the name inclines
+    // final rent =
+    //     await _client!.getMinimumBalanceForMintRentExemption(commitment: Commitment.confirmed);
+    //
+    // final rentInSol = (rent / lamportsPerSol).toDouble();
+    //
+    // final remnant = solBalance - (inputAmount + fee);
+    //
+    // if (remnant > rentInSol) return true;
+    //
+    // return false;
   }
 
   Future<PendingSolanaTransaction> _signNativeTokenTransaction({
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index 96638621a..63e70ce4d 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -35,8 +35,8 @@ const publicBitcoinTestnetElectrumUri =
     '$publicBitcoinTestnetElectrumAddress:$publicBitcoinTestnetElectrumPort';
 const cakeWalletLitecoinElectrumUri = 'ltc-electrum.cakewallet.com:50002';
 const havenDefaultNodeUri = 'nodes.havenprotocol.org:443';
-const ethereumDefaultNodeUri = 'ethereum.publicnode.com';
-const polygonDefaultNodeUri = 'polygon-bor.publicnode.com';
+const ethereumDefaultNodeUri = 'ethereum-rpc.publicnode.com';
+const polygonDefaultNodeUri = 'polygon-bor-rpc.publicnode.com';
 const cakeWalletBitcoinCashDefaultNodeUri = 'bitcoincash.stackwallet.com:50002';
 const nanoDefaultNodeUri = 'nano.nownodes.io';
 const nanoDefaultPowNodeUri = 'rpc.nano.to';
@@ -360,6 +360,18 @@ Future<void> defaultSettingsMigration(
               'solana-rpc.publicnode.com:443',
             ],
           );
+          _updateNode(
+            nodes: nodes,
+            currentUri: "ethereum.publicnode.com",
+            newUri: "ethereum-rpc.publicnode.com",
+            useSSL: true,
+          );
+          _updateNode(
+            nodes: nodes,
+            currentUri: "polygon-bor.publicnode.com",
+            newUri: "polygon-bor-rpc.publicnode.com",
+            useSSL: true,
+          );
           break;
         default:
           break;
@@ -375,6 +387,24 @@ Future<void> defaultSettingsMigration(
   await sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion, version);
 }
 
+void _updateNode({
+  required Box<Node> nodes,
+  required String currentUri,
+  String? newUri,
+  bool? useSSL,
+}) {
+  for (Node node in nodes.values) {
+    if (node.uriRaw == currentUri) {
+      if (newUri != null) {
+        node.uriRaw = newUri;
+      }
+      if (useSSL != null) {
+        node.useSSL = useSSL;
+      }
+    }
+  }
+}
+
 Future<void> _backupHavenSeeds(Box<HavenSeedStore> havenSeedStore) async {
   final future = haven?.backupHavenSeeds(havenSeedStore);
   if (future != null) {