diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs
index 3e125537b529..6e34ffd8b9f9 100644
--- a/src/status_im/multiaccounts/login/core.cljs
+++ b/src/status_im/multiaccounts/login/core.cljs
@@ -252,15 +252,17 @@
   [{:keys [db] :as cofx}]
   (let [{:keys [:multiaccount/accounts]} db]
     (fx/merge cofx
-              {:db (assoc db
-                          ;;NOTE when login the filters are initialized twice
-                          ;;once for contacts and once for chats
-                          ;;when creating an account we do it only once by calling
-                          ;;load-filters directly because we don't have chats and contacts
-                          ;;later on there is a check that filters have been initialized twice
-                          ;;so here we set it at 1 already so that it passes the check once it has
-                          ;;been initialized
-                          :filters/initialized 1)
+              {:db (-> db
+                       (dissoc :multiaccounts/login)
+                       (assoc
+                         ;;NOTE when login the filters are initialized twice
+                         ;;once for contacts and once for chats
+                         ;;when creating an account we do it only once by calling
+                         ;;load-filters directly because we don't have chats and contacts
+                         ;;later on there is a check that filters have been initialized twice
+                         ;;so here we set it at 1 already so that it passes the check once it has
+                         ;;been initialized
+                         :filters/initialized 1))
                :filters/load-filters []}
               (finish-keycard-setup)
               (protocol/initialize-protocol {:mailservers []
diff --git a/src/status_im/ui/screens/routing/chat_stack.cljs b/src/status_im/ui/screens/routing/chat_stack.cljs
index 9b2cba9921e0..a2b3f47c8b2e 100644
--- a/src/status_im/ui/screens/routing/chat_stack.cljs
+++ b/src/status_im/ui/screens/routing/chat_stack.cljs
@@ -20,8 +20,6 @@
     {:name      :chat
      :on-focus  [::chat.loading/load-messages]
      :component chat/chat}
-    {:name      :select-chat
-     :component chat/select-chat}
     {:name      :profile
      :component profile.contact/profile}
     {:name      :new-group