diff --git a/src/status_im/group_settings/handlers.cljs b/src/status_im/group_settings/handlers.cljs
index 711a7ddde1..58e8f68cdd 100644
--- a/src/status_im/group_settings/handlers.cljs
+++ b/src/status_im/group_settings/handlers.cljs
@@ -56,7 +56,9 @@
 
 (defn clear-messages
   [{:keys [current-chat-id] :as db} _]
-  (assoc-in db [:chats current-chat-id :messages] '()))
+  (-> db
+      (assoc-in [:chats current-chat-id :messages] '())
+      (assoc-in [:chats current-chat-id :last-message] nil)))
 
 (register-handler :clear-history
   (after delete-messages!)