diff --git a/src/app/chat/view.nim b/src/app/chat/view.nim
index 235f942a26..688224241d 100644
--- a/src/app/chat/view.nim
+++ b/src/app/chat/view.nim
@@ -423,8 +423,9 @@ QtObject:
 
   proc removeChat*(self: ChatsView, chatId: string) =
     discard self.chats.removeChatItemFromList(chatId)
-    self.messageList[chatId].delete
-    self.messageList.del(chatId)
+    if (self.messageList.hasKey(chatId)):
+      self.messageList[chatId].delete
+      self.messageList.del(chatId)
 
   proc removeMessagesFromTimeline*(self: ChatsView, chatId: string) =
     self.messageList[status_utils.getTimelineChatId()].deleteMessagesByChatId(chatId)