diff --git a/src/status_im/chat/models.cljs b/src/status_im/chat/models.cljs
index 89bacf9408..a72eba29f7 100644
--- a/src/status_im/chat/models.cljs
+++ b/src/status_im/chat/models.cljs
@@ -170,7 +170,7 @@
                 :group-chat                     true
                 :contacts                       #{}
                 :public?                        true
-                :might-have-join-time-messages? (get-in cofx [:multiaccount :use-mailservers?])
+                :might-have-join-time-messages? (get-in cofx [:db :multiaccount :use-mailservers?])
                 :unviewed-messages-count        0
                 :loaded-unviewed-messages-ids   #{}}
                nil))
diff --git a/src/status_im/mailserver/core.cljs b/src/status_im/mailserver/core.cljs
index 892b16e397..67df5f0b6b 100644
--- a/src/status_im/mailserver/core.cljs
+++ b/src/status_im/mailserver/core.cljs
@@ -244,8 +244,8 @@
         use-mailservers?        (fetch-use-mailservers? cofx)
         added?                  (registered-peer? peers-summary address)
         gap-request?            (executing-gap-request? db)]
-    (fx/merge cofx
-              (when use-mailservers?
+    (when use-mailservers?
+      (fx/merge cofx
                 {:db (cond-> (dissoc db :mailserver/current-request)
                        gap-request?
                        (-> (assoc :mailserver/fetching-gaps-in-progress {})
diff --git a/src/status_im/mailserver/core_test.cljs b/src/status_im/mailserver/core_test.cljs
index 3327def661..b50619fcb0 100644
--- a/src/status_im/mailserver/core_test.cljs
+++ b/src/status_im/mailserver/core_test.cljs
@@ -637,7 +637,7 @@
     (testing "it returns noops when use-mailservers? is false"
       (let [no-mailservers-cofx {:db (assoc-in db [:multiaccount :use-mailservers?] false)}]
         (is (= (mailserver/connect-to-mailserver no-mailservers-cofx)
-               no-mailservers-cofx))))))
+               nil))))))
 
 (deftest check-existing-gaps
   (testing "no gaps"