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