diff --git a/handlers/handle_private.py b/handlers/handle_private.py
index 0b1f830..f62c93c 100644
--- a/handlers/handle_private.py
+++ b/handlers/handle_private.py
@@ -23,13 +23,11 @@ async def handle_private(msg, state):
     if text.startswith("/"):
         if text == '/start':
             await telegram_api("sendMessage", chat_id=uid, text=start_message[lang])
+        elif text.startswith('/message'):
+            await edit_announce(msg)
+            return
         elif text == '/removed':
             removed_messages = await get_all_removed(uid)
             await telegram_api("sendMessage", chat_id=uid, text="\n".join(removed_messages.values()))
-        else:
-            await telegram_api("forwardMessage", from_chat_id=sender.get("id"), message_id=msg.get("id"), chat_id=FEEDBACK_CHAT_ID)
-    else:
-        try:
-            await edit_announce(msg)
-        except Exception as e:
-            logger.debug(e)
+            return
+    await telegram_api("forwardMessage", from_chat_id=sender.get("id"), message_id=msg.get("id"), chat_id=FEEDBACK_CHAT_ID)