@@ -306,13 +306,14 @@ public String url() {
    * @see #queries()
    */
   public RequestTemplate query(String name, String... values) {
-    queries.remove(checkNotNull(name, "name"));
+    String encodedName = encodeIfNotVariable(checkNotNull(name, "name"));
+    queries.remove(encodedName);
     if (values != null && values.length > 0 && values[0] != null) {
       ArrayList<String> encoded = new ArrayList<String>();
       for (String value : values) {
         encoded.add(encodeIfNotVariable(value));
       }
-      this.queries.put(encodeIfNotVariable(name), encoded);
+      this.queries.put(encodedName, encoded);
     }
     return this;
   }
 
@@ -332,4 +332,15 @@ public void uriStuffedIntoMethod() throws Exception {
 
     new RequestTemplate().method("/path?queryParam={queryParam}");
   }
+
+  @Test
+  public void encodedQueryClearedOnNull() throws Exception {
+    RequestTemplate template = new RequestTemplate();
+
+    template.query("param[]", "value");
+    assertThat(template).hasQueries(entry("param[]", asList("value")));
+
+    template.query("param[]", (String[]) null);
+    assertThat(template.queries()).isEmpty();
+  }
 }
Original file line number	Diff line number	Diff line change
`@@ -306,13 +306,14 @@ public String url() {`
`306`	`306`	`* @see #queries()`
`307`	`307`	`*/`
`308`	`308`	`public RequestTemplate query(String name, String... values) {`
`309`		`- queries.remove(checkNotNull(name, "name"));`
	`309`	`+ String encodedName = encodeIfNotVariable(checkNotNull(name, "name"));`
	`310`	`+ queries.remove(encodedName);`
`310`	`311`	`if (values != null && values.length > 0 && values[0] != null) {`
`311`	`312`	`ArrayList<String> encoded = new ArrayList<String>();`
`312`	`313`	`for (String value : values) {`
`313`	`314`	`encoded.add(encodeIfNotVariable(value));`
`314`	`315`	`}`
`315`		`- this.queries.put(encodeIfNotVariable(name), encoded);`
	`316`	`+ this.queries.put(encodedName, encoded);`
`316`	`317`	`}`
`317`	`318`	`return this;`
`318`	`319`	`}`