diff --git a/lib/connection-parameters.js b/lib/connection-parameters.js
index d6351701..c75515ab 100644
--- a/lib/connection-parameters.js
+++ b/lib/connection-parameters.js
@@ -17,7 +17,8 @@ var parse = function(str) {
     return { host: str };
   }
   // url parse expects spaces encoded as %20
-  str = encodeURI(str);
+  // however, we don't want to double-encode
+  str = encodeURI(str).replace(/\%25/g, "%");
   var result = url.parse(str);
   var config = {};
   config.host = result.hostname;