diff --git a/src/Discord.Net.Commands/CommandParser.cs b/src/Discord.Net.Commands/CommandParser.cs
index e683d1de9..cd23cbbc3 100644
--- a/src/Discord.Net.Commands/CommandParser.cs
+++ b/src/Discord.Net.Commands/CommandParser.cs
@@ -50,7 +50,7 @@ namespace Discord.Commands
                 }
 
                 //If we're processing an unparsed parameter, ignore all other logic
-                if (curParam != null && curParam.IsUnparsed)
+                if (curParam != null && curParam.IsUnparsed && curPos != endPos)
                 {
                     argBuilder.Append(c);
                     continue;