diff --git a/src/Discord.Net.Commands/CommandParser.cs b/src/Discord.Net.Commands/CommandParser.cs
index 262d3cb58..039d7e723 100644
--- a/src/Discord.Net.Commands/CommandParser.cs
+++ b/src/Discord.Net.Commands/CommandParser.cs
@@ -12,8 +12,7 @@ namespace Discord.Commands
             Parameter,
             QuotedParameter
         }
-
-        //TODO: Check support for escaping
+        
         public static async Task<ParseResult> ParseArgs(Command command, IMessage context, string input, int startPos)
         {
             CommandParameter curParam = null;
@@ -43,7 +42,7 @@ namespace Discord.Commands
                     }
                 }
                 //Are we escaping the next character?
-                if (c == '\\')
+                if (c == '\\' && (curParam == null || !curParam.IsUnparsed))
                 {
                     isEscaping = true;
                     continue;