diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 35e99328f..e857a23f8 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -690,8 +690,10 @@ void CWallet::IncrementNoteWitnesses(const CBlockIndex* pindex,
                     if (txIsOurs) {
                         JSOutPoint jsoutpt {hash, i, j};
                         if (mapWallet[hash].mapNoteData.count(jsoutpt)) {
-                            mapWallet[hash].mapNoteData[jsoutpt].witnesses.push_front(
-                                tree.witness());
+                            CNoteData* nd = &(mapWallet[hash].mapNoteData[jsoutpt]);
+                            nd->witnesses.push_front(tree.witness());
+                            // Check the validity of the cache
+                            assert(nWitnessCacheSize >= nd->witnesses.size());
                         }
                     }
                 }