diff --git a/src/llmq/instantsend.cpp b/src/llmq/instantsend.cpp
index bf76757fb2eb7..c50fa939e0f0c 100644
--- a/src/llmq/instantsend.cpp
+++ b/src/llmq/instantsend.cpp
@@ -57,42 +57,25 @@ uint256 CInstantSendLock::GetRequestId() const
 CInstantSendDb::CInstantSendDb(bool unitTests, bool fWipe) :
     db(std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/isdb"), 32 << 20, unitTests, fWipe))
 {
+    Upgrade(unitTests);
 }
 
 CInstantSendDb::~CInstantSendDb() = default;
 
-void CInstantSendDb::Upgrade(const CTxMemPool& mempool)
+void CInstantSendDb::Upgrade(bool unitTests)
 {
-    LOCK2(cs_main, mempool.cs);
     LOCK(cs_db);
     int v{0};
     if (!db->Read(DB_VERSION, v) || v < CInstantSendDb::CURRENT_VERSION) {
+        // Wipe db
+        db.reset();
+        db = std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/isdb"), 32 << 20, unitTests,
+                                          /*fWipe=*/true);
         CDBBatch batch(*db);
-        CInstantSendLock islock;
-
-        auto it = std::unique_ptr<CDBIterator>(db->NewIterator());
-        auto firstKey = std::make_tuple(std::string{DB_ISLOCK_BY_HASH}, uint256());
-        it->Seek(firstKey);
-        decltype(firstKey) curKey;
-
-        while (it->Valid()) {
-            if (!it->GetKey(curKey) || std::get<0>(curKey) != DB_ISLOCK_BY_HASH) {
-                break;
-            }
-            uint256 hashBlock;
-            CTransactionRef tx = GetTransaction(/* block_index */ nullptr, /* mempool */ nullptr, islock.txid, Params().GetConsensus(), hashBlock);
-            if (it->GetValue(islock) && !tx) {
-                // Drop locks for unknown txes
-                batch.Erase(std::make_tuple(DB_HASH_BY_TXID, islock.txid));
-                for (auto& in : islock.inputs) {
-                    batch.Erase(std::make_tuple(DB_HASH_BY_OUTPOINT, in));
-                }
-                batch.Erase(curKey);
-            }
-            it->Next();
-        }
         batch.Write(DB_VERSION, CInstantSendDb::CURRENT_VERSION);
-        db->WriteBatch(batch);
+        // Sync DB changes to disk
+        db->WriteBatch(batch, /*fSync=*/true);
+        batch.Clear();
     }
 }
 
@@ -1103,7 +1086,7 @@ void CInstantSendManager::TransactionAddedToMempool(const CTransactionRef& tx)
 
 void CInstantSendManager::TransactionRemovedFromMempool(const CTransactionRef& tx)
 {
-    if (tx->vin.empty() || !fUpgradedDB) {
+    if (tx->vin.empty()) {
         return;
     }
 
@@ -1252,11 +1235,6 @@ void CInstantSendManager::NotifyChainLock(const CBlockIndex* pindexChainLock)
 
 void CInstantSendManager::UpdatedBlockTip(const CBlockIndex* pindexNew)
 {
-    if (!fUpgradedDB && pindexNew->nHeight + 1 >= Params().GetConsensus().DIP0020Height) {
-        db.Upgrade(mempool);
-        fUpgradedDB = true;
-    }
-
     bool fDIP0008Active = pindexNew->pprev && pindexNew->pprev->nHeight >= Params().GetConsensus().DIP0008Height;
 
     if (AreChainLocksEnabled(spork_manager) && fDIP0008Active) {
diff --git a/src/llmq/instantsend.h b/src/llmq/instantsend.h
index defafa5cf2754..5f8f9e18bd680 100644
--- a/src/llmq/instantsend.h
+++ b/src/llmq/instantsend.h
@@ -112,12 +112,12 @@ class CInstantSendDb
     uint256 GetInstantSendLockHashByTxidInternal(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(cs_db);
 
 
+    void Upgrade(bool unitTests) EXCLUSIVE_LOCKS_REQUIRED(!cs_db);
+
 public:
     explicit CInstantSendDb(bool unitTests, bool fWipe);
     ~CInstantSendDb();
 
-    void Upgrade(const CTxMemPool& mempool) EXCLUSIVE_LOCKS_REQUIRED(!cs_db);
-
     /**
      * This method is called when an InstantSend Lock is processed and adds the lock to the database
      * @param hash The hash of the InstantSend Lock
@@ -209,7 +209,6 @@ class CInstantSendManager : public CRecoveredSigsListener
     const std::unique_ptr<PeerManager>& m_peerman;
 
     const bool m_is_masternode;
-    std::atomic<bool> fUpgradedDB{false};
 
     std::thread workThread;
     CThreadInterrupt workInterrupt;