diff --git a/src/cc/rogue_rpc.cpp b/src/cc/rogue_rpc.cpp
index 1c149e9b1..a7702d244 100644
--- a/src/cc/rogue_rpc.cpp
+++ b/src/cc/rogue_rpc.cpp
@@ -116,6 +116,7 @@
 
 // todo:
 // verify playerdata is usable
+// detect playerdeath/quit to prevent illegal keystrokes vector
 // verify keystrokes tx is in mempool and confirmed
 // check that bailout is legal, ie. proper gametxid vin
 // verify amulet possession in pack
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index d171812c4..47b6e6df4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2810,9 +2810,12 @@ void CWallet::ReacceptWalletTransactions()
             }
         }
     }
-    for (auto hash : vwtxh)
+    if ( IsInitialBlockDownload() == 0 )
     {
-        EraseFromWallet(hash);
+        for (auto hash : vwtxh)
+        {
+            EraseFromWallet(hash);
+        }
     }
 }