diff --git a/src/dogapi/common.cr b/src/dogapi/common.cr
index c3890ed..4085763 100755
--- a/src/dogapi/common.cr
+++ b/src/dogapi/common.cr
@@ -71,7 +71,7 @@ module Dogapi
         application_key: @application_key ? with_app_key : nil,
       }
       params = extra_params.merge params unless extra_params.nil?
-      qs_params = params.map { |k, v| URI.encode(k.to_s) + '=' + URI.encode(v.to_s) }
+      qs_params = params.map { |k, v| URI.encode_path_segment(k.to_s) + '=' + URI.encode_path_segment(v.to_s) }
       qs = '?' + qs_params.join('&')
       qs
     end