diff --git a/bot.py b/bot.py
index 60e0fef..a1347e6 100644
--- a/bot.py
+++ b/bot.py
@@ -274,22 +274,25 @@ async def on_message(message):
     if "conjurer:" in message.content:
         async with channel.typing():
             logger.debug("Procedura chatu")
-            message.content = message.content.replace("conjurer: ", "")
-            message.content = message.content.replace(str(client.user), "")
-            prompt = message.content
 
+            message.content = message.content.replace("conjurer: ", "")
             if message.author.nick:
                 username = message.author.nick
             else:
                 username = message.author.name
             vykidailo = False
             bartender = False
+            if kondziu_mentioned:
+                prompt = message.clean_content
+            else:
+                prompt = message.content
             for role in message.author.roles:
                 if role.name == "Vykidailo":
                     vykidailo = True
                 if role.name == "Bartender":
                     bartender = True
             global MESSAGE_TABLE  # pylint: disable=global-statement
+
             result, MESSAGE_TABLE = await handle_response(
                 prompt, vykidailo, bartender, MESSAGE_TABLE, username, False
             )