diff --git a/src/status_im/contexts/wallet/events.cljs b/src/status_im/contexts/wallet/events.cljs
index c755e3991a..634fc5f45d 100644
--- a/src/status_im/contexts/wallet/events.cljs
+++ b/src/status_im/contexts/wallet/events.cljs
@@ -148,12 +148,12 @@
 (rf/defn scan-address-success
   {:events [:wallet/scan-address-success]}
   [{:keys [db]} address]
-  {:db (assoc db :wallet/scanned-address address)})
+  {:db (assoc-in db [:wallet :ui :scanned-address] address)})
 
 (rf/defn clean-scanned-address
   {:events [:wallet/clean-scanned-address]}
   [{:keys [db]}]
-  {:db (dissoc db :wallet/scanned-address :wallet/send-address)})
+  {:db (update-in db [:wallet :ui] dissoc :scanned-address)})
 
 (rf/reg-event-fx :wallet/create-derived-addresses
  (fn [{:keys [db]} [{:keys [sha3-pwd path]} on-success]]
diff --git a/src/status_im/contexts/wallet/events_test.cljs b/src/status_im/contexts/wallet/events_test.cljs
index 32e2b7edd2..1813f58a4c 100644
--- a/src/status_im/contexts/wallet/events_test.cljs
+++ b/src/status_im/contexts/wallet/events_test.cljs
@@ -10,15 +10,16 @@
 (deftest scan-address-success
   (let [db {}]
     (testing "scan-address-success"
-      (let [expected-db {:wallet/scanned-address address}
+      (let [expected-db {:wallet {:ui {:scanned-address address}}}
             effects     (events/scan-address-success {:db db} address)
             result-db   (:db effects)]
         (is (match? result-db expected-db))))))
 
 (deftest clean-scanned-address
-  (let [db {:wallet/scanned-address address}]
+  (let [db {:wallet {:ui {:scanned-address address}}}]
     (testing "clean-scanned-address"
-      (let [expected-db {:wallet {:ui {:send nil}}}
+      (let [expected-db {:wallet {:ui {:send            nil
+                                       :scanned-address nil}}}
             effects     (events/clean-scanned-address {:db db})
             result-db   (:db effects)]
         (is (match? result-db expected-db))))))
diff --git a/src/status_im/subs/root.cljs b/src/status_im/subs/root.cljs
index a5ec336f62..4198c0772b 100644
--- a/src/status_im/subs/root.cljs
+++ b/src/status_im/subs/root.cljs
@@ -156,8 +156,6 @@
 
 ;;wallet
 (reg-root-key-sub :wallet :wallet)
-(reg-root-key-sub :wallet/scanned-address :wallet/scanned-address)
-(reg-root-key-sub :wallet/create-account :wallet/create-account)
 (reg-root-key-sub :wallet/local-suggestions :wallet/local-suggestions)
 (reg-root-key-sub :wallet/valid-ens-or-address? :wallet/valid-ens-or-address?)
 
diff --git a/src/status_im/subs/wallet/wallet.cljs b/src/status_im/subs/wallet/wallet.cljs
index 53f70d1814..9c56023bc7 100644
--- a/src/status_im/subs/wallet/wallet.cljs
+++ b/src/status_im/subs/wallet/wallet.cljs
@@ -28,6 +28,11 @@
  :<- [:wallet]
  :-> :ui)
 
+(rf/reg-sub
+ :wallet/scanned-address
+ :<- [:wallet/ui]
+ :-> :scanned-address)
+
 (rf/reg-sub
  :wallet/tokens-loading?
  :<- [:wallet/ui]