diff --git a/src/status_im/chat/handlers.cljs b/src/status_im/chat/handlers.cljs
index cdbdba4ba6..591b5538dc 100644
--- a/src/status_im/chat/handlers.cljs
+++ b/src/status_im/chat/handlers.cljs
@@ -392,10 +392,9 @@
 (defn delete-chat!
   [_ [_ chat-id]]
   (let [{:keys [debug? group-chat]} (chats/get-by-id chat-id)]
-    (when group-chat
-      (if debug?
-        (chats/delete chat-id)
-        (chats/set-inactive chat-id)))))
+    (if (and (not debug?) group-chat)
+      (chats/set-inactive chat-id)
+      (chats/delete chat-id))))
 
 (defn remove-pending-messages!
   [_ [_ chat-id]]