diff --git a/flake.lock b/flake.lock
index de56abfd..94bff35c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750506804,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "lastModified": 1761373498,
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
diff --git a/packages/main/src/telegram_bot.ts b/packages/main/src/telegram_bot.ts
index ee4c1011..c79d638e 100644
--- a/packages/main/src/telegram_bot.ts
+++ b/packages/main/src/telegram_bot.ts
@@ -77,8 +77,8 @@ export default class TelegramBot {
     }
 
     // Then check if it's a command starting with /
-    if (args.at(0)?.startsWith('/')) {
-      const command = args.at(0)?.slice(1) ?? '';
+    if (args[0] && args[0].startsWith('/')) {
+      const command = args[0].substring(1, args[0].lastIndexOf('@') > -1 ? args[0].lastIndexOf('@') : args[0].length);
       return command in this.commands ? command : this.defaultCommand;
     }