diff --git a/__tests__/__fixtures__/output/r/httr/query-encoded.r b/__tests__/__fixtures__/output/r/httr/query-encoded.r
index c673178d9..f0008a9e1 100644
--- a/__tests__/__fixtures__/output/r/httr/query-encoded.r
+++ b/__tests__/__fixtures__/output/r/httr/query-encoded.r
@@ -3,8 +3,8 @@ library(httr)
 url <- "https://httpbin.org/anything"
 
 queryString <- list(
-  startTime = "2019-06-13T19%3A08%3A25.455Z"
-  endTime = "2015-09-15T14%3A00%3A12-04%3A00",
+  startTime = "2019-06-13T19%3A08%3A25.455Z",
+  endTime = "2015-09-15T14%3A00%3A12-04%3A00"
 )
 
 response <- VERB("GET", url, query = queryString, content_type("application/octet-stream"))
diff --git a/src/targets/r/httr.js b/src/targets/r/httr.js
index 61562f283..7a891d675 100644
--- a/src/targets/r/httr.js
+++ b/src/targets/r/httr.js
@@ -23,20 +23,17 @@ module.exports = function (source) {
 
   // Construct query string
   const qs = source.queryObj;
-  const queryCount = Object.keys(qs).length;
   // eslint-disable-next-line no-param-reassign
   delete source.queryObj.key;
 
-  if (source.queryString.length === 1) {
+  const queryCount = Object.keys(qs).length;
+  if (queryCount === 1) {
     code.push('queryString <- list(%s = "%s")', Object.keys(qs), Object.values(qs).toString()).blank();
-  } else if (source.queryString.length > 1) {
-    let count = 1;
-
+  } else if (queryCount > 1) {
     code.push('queryString <- list(');
 
-    Object.keys(qs).forEach(query => {
-      // eslint-disable-next-line no-plusplus
-      if (count++ !== queryCount - 1) {
+    Object.keys(qs).forEach((query, i) => {
+      if (i !== queryCount - 1) {
         code.push('  %s = "%s",', query, qs[query].toString());
       } else {
         code.push('  %s = "%s"', query, qs[query].toString());