diff --git a/common/src/main/java/revxrsal/commands/parameter/StringParameterType.java b/common/src/main/java/revxrsal/commands/parameter/StringParameterType.java
index 73595d2d..e7b0ce88 100644
--- a/common/src/main/java/revxrsal/commands/parameter/StringParameterType.java
+++ b/common/src/main/java/revxrsal/commands/parameter/StringParameterType.java
@@ -54,9 +54,9 @@ private StringParameterType(boolean greedy) {
 
     @Override
     public String parse(@NotNull MutableStringStream input, @NotNull ExecutionContext<CommandActor> context) {
-        if (greedy)
-            return input.consumeRemaining();
-        return input.readString();
+        if (input.peek() == '"' || !greedy)
+            return input.readString();
+        return input.consumeRemaining();
     }
 
     @Override public boolean isGreedy() {