diff --git a/src/status_im/chat/models/loading.cljs b/src/status_im/chat/models/loading.cljs
index 96f573211e..1995bb0a4b 100644
--- a/src/status_im/chat/models/loading.cljs
+++ b/src/status_im/chat/models/loading.cljs
@@ -59,12 +59,14 @@
 
 (defn mark-chat-all-read
   [db chat-id]
-  (update-in db
-             [:chats chat-id]
-             assoc
-             :unviewed-messages-count 0
-             :unviewed-mentions-count 0
-             :highlight               false))
+  (when (get-in db [:chats chat-id])
+    (update-in
+     db
+     [:chats chat-id]
+     assoc
+     :unviewed-messages-count 0
+     :unviewed-mentions-count 0
+     :highlight               false)))
 
 (rf/defn handle-mark-all-read-successful
   {:events [::mark-all-read-successful]}
diff --git a/src/status_im2/contexts/chat/messages/view.cljs b/src/status_im2/contexts/chat/messages/view.cljs
index f558315ca2..b99fc1944c 100644
--- a/src/status_im2/contexts/chat/messages/view.cljs
+++ b/src/status_im2/contexts/chat/messages/view.cljs
@@ -18,8 +18,9 @@
       :chat           current-chat
       :header-comp    (fn [{:keys [scroll-y]}]
                         [messages.navigation/navigation-view {:scroll-y scroll-y}])
-      :footer-comp    (fn [{:keys [insets]}]
-                        (if-not able-to-send-message?
-                          [contact-requests.bottom-drawer/view chat-id contact-request-state
-                           group-chat]
-                          [:f> composer/composer insets]))}]))
+      :footer-comp    (when (some? able-to-send-message?)
+                        (fn [{:keys [insets]}]
+                          (if-not able-to-send-message?
+                            [contact-requests.bottom-drawer/view chat-id contact-request-state
+                             group-chat]
+                            [:f> composer/composer insets])))}]))