diff --git a/main.py b/main.py
index 7aec409..612815c 100755
--- a/main.py
+++ b/main.py
@@ -253,9 +253,10 @@ async def gif_command_handler(message: discord.Message, command: list[str]):
 
     target = message.author.name
     sender = message.author.name
+    
     if len(message.mentions) > 0:
         target = message.mentions[0].name
-
+        
     if command_typed == "help":
         await message.reply(HELP_MESSAGE)
         return
@@ -290,10 +291,17 @@ async def on_message(message: discord.Message):
     if message.author.bot == True:
         return
 
-    # TODO: Do proper parsing of the message
-    message_as_command = message.content.split(" ")
+    # Should prevent the bot from being accidentally triggered from now on. Also will make
+    # the people here have to say nya more often which is always a bonus.
+    if message.content.startswith('nya') == False:
+        return
 
+    # TODO: Do proper parsing of the message
+    message_as_command = message.content.split("nya ")
+    message_as_command = message_as_command[1].split(" ")
+    
     command = message_as_command[0]
+    
     if command in GIF_COMMANDS:
         await gif_command_handler(message, message_as_command)