diff --git a/backend/src/api/services/wallets.ts b/backend/src/api/services/wallets.ts
index dd4d7ebc9..f498a80ad 100644
--- a/backend/src/api/services/wallets.ts
+++ b/backend/src/api/services/wallets.ts
@@ -30,6 +30,7 @@ const POLL_FREQUENCY = 5 * 60 * 1000; // 5 minutes
 class WalletApi {
   private wallets: Record<string, Wallet> = {};
   private syncing = false;
+  private lastSync = 0;
 
   constructor() {
     this.wallets = config.WALLETS.ENABLED ? (config.WALLETS.WALLETS as string[]).reduce((acc, wallet) => {
@@ -47,7 +48,38 @@ class WalletApi {
     if (!config.WALLETS.ENABLED || this.syncing) {
       return;
     }
+
     this.syncing = true;
+
+    if (config.WALLETS.AUTO && (Date.now() - this.lastSync) > POLL_FREQUENCY) {
+      try {
+        // update list of active wallets
+        this.lastSync = Date.now();
+        const response = await axios.get(config.MEMPOOL_SERVICES.API + `/wallets`);
+        const walletList: string[] = response.data;
+        if (walletList) {
+          // create a quick lookup dictionary of active wallets
+          const newWallets: Record<string, boolean> = Object.fromEntries(
+            walletList.map(wallet => [wallet, true])
+          );
+          for (const wallet of walletList) {
+            // don't overwrite existing wallets
+            if (!this.wallets[wallet]) {
+              this.wallets[wallet] = { name: wallet, addresses: {}, lastPoll: 0 };
+            }
+          }
+          // remove wallets that are no longer active
+          for (const wallet of Object.keys(this.wallets)) {
+            if (!newWallets[wallet]) {
+              delete this.wallets[wallet];
+            }
+          }
+        }
+      } catch (e) {
+        logger.err(`Error updating active wallets: ${(e instanceof Error ? e.message : e)}`);
+      }
+    }
+
     for (const walletKey of Object.keys(this.wallets)) {
       const wallet = this.wallets[walletKey];
       if (wallet.lastPoll < (Date.now() - POLL_FREQUENCY)) {
@@ -72,6 +104,7 @@ class WalletApi {
         }
       }
     }
+
     this.syncing = false;
   }
 
diff --git a/backend/src/config.ts b/backend/src/config.ts
index a1050a7d5..3fe3db2ee 100644
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -164,6 +164,7 @@ interface IConfig {
   },
   WALLETS: {
     ENABLED: boolean;
+    AUTO: boolean;
     WALLETS: string[];
   },
   STRATUM: {
@@ -334,6 +335,7 @@ const defaults: IConfig = {
   },
   'WALLETS': {
     'ENABLED': false,
+    'AUTO': false,
     'WALLETS': [],
   },
   'STRATUM': {
diff --git a/production/mempool-config.mainnet.json b/production/mempool-config.mainnet.json
index 9505601d2..87f58f916 100644
--- a/production/mempool-config.mainnet.json
+++ b/production/mempool-config.mainnet.json
@@ -159,6 +159,7 @@
   },
   "WALLETS": {
     "ENABLED": true,
+    "AUTO": true,
     "WALLETS": ["BITB", "3350"]
   },
   "STRATUM": {