diff --git a/crypto_plugins/flutter_libmwc b/crypto_plugins/flutter_libmwc
index ff25b6540..19764f5c8 160000
--- a/crypto_plugins/flutter_libmwc
+++ b/crypto_plugins/flutter_libmwc
@@ -1 +1 @@
-Subproject commit ff25b6540698e6fe3e89dda5f0480552a882369d
+Subproject commit 19764f5c8adbf93567962ea94e9ff146205aaf45
diff --git a/lib/utilities/default_mwcmqs.dart b/lib/utilities/default_mwcmqs.dart
index 75be1d247..84e7356d8 100644
--- a/lib/utilities/default_mwcmqs.dart
+++ b/lib/utilities/default_mwcmqs.dart
@@ -17,7 +17,7 @@ abstract class DefaultMwcMqs {
   static List<String> get defaultIds => ['americas', 'asia', 'europe'];
 
   static MwcMqsServerModel get americas => MwcMqsServerModel(
-        host: 'MwcMqs.stackwallet.com',
+        host: 'mqs.mwc.mw',
         port: 443,
         name: 'Americas',
         id: 'americas',
@@ -28,7 +28,7 @@ abstract class DefaultMwcMqs {
       );
 
   static MwcMqsServerModel get asia => MwcMqsServerModel(
-        host: 'MwcMqs.hyperbig.com',
+        host: 'mqs.mwc.mw',
         port: 443,
         name: 'Asia',
         id: 'asia',
@@ -39,7 +39,7 @@ abstract class DefaultMwcMqs {
       );
 
   static MwcMqsServerModel get europe => MwcMqsServerModel(
-        host: 'MwcMqs.fastepic.eu',
+        host: 'mqs.mwc.mw',
         port: 443,
         name: 'Europe',
         id: 'europe',
diff --git a/lib/wallets/wallet/impl/mimblewimblecoin_wallet.dart b/lib/wallets/wallet/impl/mimblewimblecoin_wallet.dart
index 9edce8a5a..83d038e9d 100644
--- a/lib/wallets/wallet/impl/mimblewimblecoin_wallet.dart
+++ b/lib/wallets/wallet/impl/mimblewimblecoin_wallet.dart
@@ -524,7 +524,7 @@ class MimblewimblecoinWallet extends Bip39Wallet {
         );
 
         //Store MwcMqs address info
-        await _generateAndStoreReceivingAddressForIndex(0);
+        // await _generateAndStoreReceivingAddressForIndex(0);
 
         // subtract a couple days to ensure we have a buffer for SWB
         final bufferedCreateHeight = _calculateRestoreHeightFrom(
@@ -754,9 +754,9 @@ class MimblewimblecoinWallet extends Bip39Wallet {
             value: walletOpen,
           );
 
-          await _generateAndStoreReceivingAddressForIndex(
-            mimblewimblecoinData.receivingIndex,
-          );
+          // await _generateAndStoreReceivingAddressForIndex(
+          //   mimblewimblecoinData.receivingIndex,
+          // );
         }
       });
 
@@ -799,7 +799,7 @@ class MimblewimblecoinWallet extends Bip39Wallet {
 
       // this will always be zero????
       final int curAdd = await _getCurrentIndex();
-      await _generateAndStoreReceivingAddressForIndex(curAdd);
+      // await _generateAndStoreReceivingAddressForIndex(curAdd);
 
       await _startScans();
 
@@ -1087,22 +1087,23 @@ class MimblewimblecoinWallet extends Bip39Wallet {
 
   @override
   Future<bool> pingCheck() async {
-    try {
-      final node = nodeService.getPrimaryNodeFor(currency: cryptoCurrency);
-
-      // force unwrap optional as we want connection test to fail if wallet
-      // wasn't initialized or mwcmqs node was set to null
-      return await testMwcNodeConnection(
-            NodeFormData()
-              ..host = node!.host
-              ..useSSL = node.useSSL
-              ..port = node.port,
-          ) !=
-          null;
-    } catch (e, s) {
-      Logging.instance.log("$e\n$s", level: LogLevel.Info);
-      return false;
-    }
+    return true;
+    //try {
+    //  final node = nodeService.getPrimaryNodeFor(currency: cryptoCurrency);
+//
+    //  // force unwrap optional as we want connection test to fail if wallet
+    //  // wasn't initialized or mwcmqs node was set to null
+    //  return await testMwcNodeConnection(
+    //        NodeFormData()
+    //          ..host = node!.host
+    //          ..useSSL = node.useSSL
+    //          ..port = node.port,
+    //      ) !=
+    //      null;
+    //} catch (e, s) {
+    //  Logging.instance.log("$e\n$s", level: LogLevel.Info);
+    //  return false;
+    //}
   }
 
   @override
diff --git a/pubspec.lock b/pubspec.lock
index 5b3840d69..8a7b90199 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -883,7 +883,7 @@ packages:
     source: hosted
     version: "2.4.4"
   frontend_server_client:
-    dependency: "direct dev"
+    dependency: transitive
     description:
       name: frontend_server_client
       sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694