1 files changed, 6 insertions, 2 deletions
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index 99ab00f793..5b57d79b00 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -31,6 +31,7 @@ mir_cs csChat;
 HMENU g_hMenu = nullptr;
 HGENMENU hJoinMenuItem, hLeaveMenuItem;
 MWindowList g_hWindowList;
+HANDLE hevSendEvent, hevBuildMenuEvent;
 
 static HANDLE
    hServiceRegister = nullptr,
@@ -811,9 +812,12 @@ void UnloadChatModule(void)
 
 	WindowList_Destroy(g_hWindowList);
 
-	DestroyHookableEvent(chatApi.hSendEvent);
-	DestroyHookableEvent(chatApi.hBuildMenuEvent);
+	DestroyHookableEvent(hevSendEvent);
+	DestroyHookableEvent(hevBuildMenuEvent);
 	DestroyHookableEvent(hHookEvent);
 
+	DestroyHookableEvent(chatApi.hevPreCreate);
+	DestroyHookableEvent(chatApi.hevWinPopup);
+
 	DestroyMenu(g_hMenu);
 }