diff --git a/app/dragon-bot.py b/app/dragon-bot.py
index e347e375..34ad8eda 100644
--- a/app/dragon-bot.py
+++ b/app/dragon-bot.py
@@ -265,6 +265,11 @@ async def on_message(message):
         )
 
     if message.content.startswith('!quake'):
+        if len(message.content.split()) == 1:
+            return await client.send_message(
+                message.channel,
+                help_methods.get_help_message('quake')
+            )
         await client.send_message(
             message.channel,
             embed=quake.parse_message(message)
diff --git a/app/quake.py b/app/quake.py
index 565b21e9..490417c7 100644
--- a/app/quake.py
+++ b/app/quake.py
@@ -9,9 +9,6 @@ def parse_message(message):
 
   Handles the message and looks for a plaer name.
   """
-  if len(message.content.split()) == 1:
-    return help_methods.get_help_message('quake')
-
   # Return the player's name
   name = message.content.split()[1]
   if len(message.content.split()) > 1: