diff --git a/src/status_im/data_store/realm/schemas/account/v16/core.cljs b/src/status_im/data_store/realm/schemas/account/v16/core.cljs
index 1ffd365d6c..9a933e2183 100644
--- a/src/status_im/data_store/realm/schemas/account/v16/core.cljs
+++ b/src/status_im/data_store/realm/schemas/account/v16/core.cljs
@@ -64,7 +64,10 @@
   (log/debug "migrating v16 account database: " old-realm new-realm)
   (when-let [wallet-chat (chat-by-id new-realm "wallet")]
     (.delete new-realm wallet-chat))
-  (when-let [wallet-contact (chat-by-id new-realm "wallet")]
+  (when-let [wallet-contact (some-> new-realm
+                                    (.objects "contact")
+                                    (.filtered (str "whisper-identity = \"wallet\""))
+                                    (aget 0))]
     (.delete new-realm wallet-contact))
   (migrate-commands new-realm "command-request")
   (migrate-commands new-realm "command"))