diff --git a/Geekbot.net/Handlers.cs b/Geekbot.net/Handlers.cs
index bf62cac..d671c76 100644
--- a/Geekbot.net/Handlers.cs
+++ b/Geekbot.net/Handlers.cs
@@ -40,7 +40,7 @@ namespace Geekbot.net
             if (message.Author.IsBot) return Task.CompletedTask;
             var argPos = 0;
             var lowCaseMsg = message.ToString().ToLower();
-            if (lowCaseMsg.StartsWith("ping"))
+            if (lowCaseMsg.Equals("ping") || lowCaseMsg.StartsWith("ping "))
             {
                 message.Channel.SendMessageAsync("pong");
                 return Task.CompletedTask;