diff --git a/lib/electrumx_rpc/cached_electrumx_client.dart b/lib/electrumx_rpc/cached_electrumx_client.dart
index 3a93bb5d8..559526f17 100644
--- a/lib/electrumx_rpc/cached_electrumx_client.dart
+++ b/lib/electrumx_rpc/cached_electrumx_client.dart
@@ -109,6 +109,7 @@ class CachedElectrumXClient {
     required String groupId,
     String blockhash = "",
     required Coin coin,
+    required bool useOnlyCacheIfNotEmpty,
   }) async {
     try {
       final box = await DB.instance.getSparkAnonymitySetCacheBox(coin: coin);
@@ -126,6 +127,9 @@ class CachedElectrumXClient {
         };
       } else {
         set = Map<String, dynamic>.from(cachedSet);
+        if (useOnlyCacheIfNotEmpty) {
+          return set;
+        }
       }
 
       final newSet = await electrumXClient.getSparkAnonymitySet(
diff --git a/lib/wallets/wallet/impl/firo_wallet.dart b/lib/wallets/wallet/impl/firo_wallet.dart
index a0d735ac5..ea109fe61 100644
--- a/lib/wallets/wallet/impl/firo_wallet.dart
+++ b/lib/wallets/wallet/impl/firo_wallet.dart
@@ -621,6 +621,7 @@ class FiroWallet extends Bip39HDWallet
         final sparkAnonSetFuture = electrumXCachedClient.getSparkAnonymitySet(
           groupId: latestSparkCoinId.toString(),
           coin: info.coin,
+          useOnlyCacheIfNotEmpty: false,
         );
         final sparkUsedCoinTagsFuture =
             electrumXCachedClient.getSparkUsedCoinsTags(
diff --git a/lib/wallets/wallet/wallet_mixin_interfaces/spark_interface.dart b/lib/wallets/wallet/wallet_mixin_interfaces/spark_interface.dart
index f25f22323..7aaa1d3ed 100644
--- a/lib/wallets/wallet/wallet_mixin_interfaces/spark_interface.dart
+++ b/lib/wallets/wallet/wallet_mixin_interfaces/spark_interface.dart
@@ -259,6 +259,7 @@ mixin SparkInterface on Bip39HDWallet, ElectrumXInterface {
       final set = await electrumXCachedClient.getSparkAnonymitySet(
         groupId: i.toString(),
         coin: info.coin,
+        useOnlyCacheIfNotEmpty: true,
       );
       set["coinGroupID"] = i;
       setMaps.add(set);
@@ -616,22 +617,14 @@ mixin SparkInterface on Bip39HDWallet, ElectrumXInterface {
     try {
       final latestSparkCoinId = await electrumXClient.getSparkLatestCoinId();
 
-      final blockHash = await _getCachedSparkBlockHash();
-      final startNumber = await _getSparkCoinsStartNumber();
+      final anonymitySetFuture = electrumXCachedClient.getSparkAnonymitySet(
+        groupId: latestSparkCoinId.toString(),
+        coin: info.coin,
+        useOnlyCacheIfNotEmpty: false,
+      );
 
-      final anonymitySetFuture = blockHash == null
-          ? electrumXCachedClient.getSparkAnonymitySet(
-              groupId: latestSparkCoinId.toString(),
-              coin: info.coin,
-            )
-          : electrumXClient.getSparkAnonymitySet(
-              coinGroupId: latestSparkCoinId.toString(),
-              startBlockHash: blockHash,
-            );
-
-      final spentCoinTagsFuture = startNumber == null
-          ? electrumXCachedClient.getSparkUsedCoinsTags(coin: info.coin)
-          : electrumXClient.getSparkUsedCoinsTags(startNumber: startNumber);
+      final spentCoinTagsFuture =
+          electrumXCachedClient.getSparkUsedCoinsTags(coin: info.coin);
 
       final futureResults = await Future.wait([
         anonymitySetFuture,
@@ -665,15 +658,6 @@ mixin SparkInterface on Bip39HDWallet, ElectrumXInterface {
         );
 
         myCoins.addAll(identifiedCoins);
-
-        // update blockHash in cache
-        final String newBlockHash =
-            base64ToReverseHex(anonymitySet["blockHash"] as String);
-
-        await Future.wait([
-          _setCachedSparkBlockHash(newBlockHash),
-          _setSparkCoinsStartNumber(spentCoinTags.length - 1),
-        ]);
       }
 
       // check current coins
@@ -788,10 +772,6 @@ mixin SparkInterface on Bip39HDWallet, ElectrumXInterface {
       // update wallet spark coins in isar
       await _addOrUpdateSparkCoins(myCoins);
 
-      // update blockHash in cache
-      final String newBlockHash = anonymitySet["blockHash"] as String;
-      await _setCachedSparkBlockHash(newBlockHash);
-
       // refresh spark balance
       await refreshSparkBalance();
     } catch (e, s) {
@@ -1602,31 +1582,6 @@ mixin SparkInterface on Bip39HDWallet, ElectrumXInterface {
 
   // ====================== Private ============================================
 
-  final _kSparkAnonSetCachedBlockHashKey = "SparkAnonSetCachedBlockHashKey";
-  final _kSparkCoinsStartNumberKey = "SparkCoinsStartNumberKey";
-
-  Future<String?> _getCachedSparkBlockHash() async {
-    return info.otherData[_kSparkAnonSetCachedBlockHashKey] as String?;
-  }
-
-  Future<void> _setCachedSparkBlockHash(String blockHash) async {
-    await info.updateOtherData(
-      newEntries: {_kSparkAnonSetCachedBlockHashKey: blockHash},
-      isar: mainDB.isar,
-    );
-  }
-
-  Future<int?> _getSparkCoinsStartNumber() async {
-    return info.otherData[_kSparkCoinsStartNumberKey] as int?;
-  }
-
-  Future<void> _setSparkCoinsStartNumber(int startNumber) async {
-    await info.updateOtherData(
-      newEntries: {_kSparkCoinsStartNumberKey: startNumber},
-      isar: mainDB.isar,
-    );
-  }
-
   Future<void> _addOrUpdateSparkCoins(List<SparkCoin> coins) async {
     if (coins.isNotEmpty) {
       await mainDB.isar.writeTxn(() async {