diff --git a/program/userbot_tools.py b/program/userbot_tools.py
index 0f0a438..47a54e2 100644
--- a/program/userbot_tools.py
+++ b/program/userbot_tools.py
@@ -5,6 +5,7 @@ from pyrogram import Client, filters
 from config import BOT_USERNAME, SUDO_USERS
 from driver.filters import command, other_filters
 from driver.database.dbchat import remove_served_chat
+from driver.database.dbqueue import remove_active_chat
 from pyrogram.errors import UserAlreadyParticipant, UserNotParticipant
 from driver.decorators import authorized_users_only, bot_creator
 
@@ -22,6 +23,7 @@ async def join_chat(c: Client, m: Message):
                 "https://t.me/+", "https://t.me/joinchat/"
             )
             await user.join_chat(invitelink)
+            await remove_active_chat(chat_id)
             return await user.send_message(chat_id, "✅ userbot joined chat")
     except UserAlreadyParticipant:
         return await user.send_message(chat_id, "✅ userbot already in chat")
@@ -35,6 +37,7 @@ async def leave_chat(_, m: Message):
     chat_id = m.chat.id
     try:
         await user.leave_chat(chat_id)
+        await remove_active_chat(chat_id)
         return await _.send_message(
             chat_id,
             "✅ userbot leaved chat",
@@ -59,6 +62,7 @@ async def leave_all(client, message):
     async for dialog in user.iter_dialogs():
         try:
             await user.leave_chat(dialog.chat.id)
+            await remove_active_chat(dialog.chat.id)
             left += 1
             await msg.edit(
                 f"Userbot leaving all Group...\n\nLeft: {left} chats.\nFailed: {failed} chats."
@@ -83,3 +87,4 @@ async def bot_kicked(c: Client, m: Message):
     if left_member.id == bot_id:
         await user.leave_chat(chat_id)
         await remove_served_chat(chat_id)
+        await remove_active_chat(chat_id)