diff --git a/lib/google/api_client/discovery/method.rb b/lib/google/api_client/discovery/method.rb
index a1ec1b455..8f0198507 100644
--- a/lib/google/api_client/discovery/method.rb
+++ b/lib/google/api_client/discovery/method.rb
@@ -172,12 +172,14 @@ module Google
         query_parameters = parameters.reject do |k, v|
           template_variables.include?(k)
         end
-        if query_parameters.size > 0
-          uri.query_values = (uri.query_values || []) + query_parameters
+        # encode all non-template parameters
+        params = ""
+        unless query_parameters.empty?
+          params = "?" + Addressable::URI.form_encode(query_parameters)
         end
         # Normalization is necessary because of undesirable percent-escaping
         # during URI template expansion
-        return uri.normalize
+        return uri.normalize + params
       end
 
       ##