diff --git a/lib/connection-parameters.js b/lib/connection-parameters.js
index 612f0b670..2318269c0 100644
--- a/lib/connection-parameters.js
+++ b/lib/connection-parameters.js
@@ -12,7 +12,9 @@ var val = function(key, config, envVar) {
     envVar = process.env[ envVar ];
   }
 
-  return config[key] ||
+  // let the user connect without selecting a database
+  if (key === 'database' && config.noDatabase) return '';
+  else return config[key] ||
     envVar ||
     defaults[key];
 };