diff --git a/core/api.cfc b/core/api.cfc
index 0ccc6a57..43724708 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -473,7 +473,11 @@
 		</cfif>
 		<!--- query_string input is also key-value pairs --->
 		<cfloop list="#arguments.queryString#" delimiters="&" index="local.t">
-			<cfset local.returnData[listFirst(local.t,'=')] = urlDecode(listLast(local.t,'=')) />
+			<cfif listLen(local.t,'=') eq 2>
+				<cfset local.returnData[listFirst(local.t,'=')] = urlDecode(listLast(local.t,'=')) />
+			<cfelse>
+				<cfset local.returnData[listFirst(local.t,'=')] = "" />
+			</cfif>
 		</cfloop>
 		<!--- if a mime type is requested as part of the url ("whatever.json"), then extract that so taffy can use it --->
 		<cfif listContainsNoCase(structKeyList(application._taffy.settings.mimeExtensions), listLast(arguments.uri,"."))>
diff --git a/tests/tests/TestCore.cfc b/tests/tests/TestCore.cfc
index 135591b8..943affbb 100644
--- a/tests/tests/TestCore.cfc
+++ b/tests/tests/TestCore.cfc
@@ -246,6 +246,20 @@
 			assertEquals("hotel", local.deserializedContent["bar"]);
 			assertEquals("foxtrot", local.deserializedContent["baz"]);
 		}
+		
+		function get_queryString_keys_without_values_returns_empty_string() {
+			makePublic(variables.taffy, "buildRequestArguments");
+			
+			var returnedArguments = variables.taffy.buildRequestArguments(
+				regex = "/testResource/(\.[^\.\?]+)?$",
+				tokenNamesArray = [],
+				uri = "/testResource/",
+				queryString = "keyOne=valueOne&keyTwo=&keyThree=valueThree",
+				headers = {}
+			);
+			
+			assertEquals("", returnedArguments["keyTwo"]);
+		}
 	</cfscript>
 
 </cfcomponent>
\ No newline at end of file