diff --git a/packages/cli-repl/src/uri-generator.spec.ts b/packages/cli-repl/src/uri-generator.spec.ts
index b4e54e3d29..f171332629 100644
--- a/packages/cli-repl/src/uri-generator.spec.ts
+++ b/packages/cli-repl/src/uri-generator.spec.ts
@@ -10,6 +10,15 @@ describe('uri-generator.generate-uri', () => {
     });
   });
 
+  context('when no URI is provided', () => {
+    it('handles host', () => {
+      expect(generateUri({ _: [], host: 'localhost'})).to.equal('mongodb://localhost:27017')
+    });
+    it('handles port', () => {
+      expect(generateUri({ _: [], port: '27018' })).to.equal('mongodb://127.0.0.1:27018')
+    });
+  });
+
   context('when a full URI is provided', () => {
     context('when no additional options are provided', () => {
       const uri = 'mongodb://192.0.0.1:27018/foo';
diff --git a/packages/cli-repl/src/uri-generator.ts b/packages/cli-repl/src/uri-generator.ts
index cdf766e4db..02a0024db5 100644
--- a/packages/cli-repl/src/uri-generator.ts
+++ b/packages/cli-repl/src/uri-generator.ts
@@ -61,7 +61,7 @@ function validateConflicts(options: CliOptions): any {
  *
  * @returns {string} The host.
  */
-function generateHost(options: CliOptions = {}): string {
+function generateHost(options: CliOptions): string {
   return options.host ? options.host : DEFAULT_HOST;
 }
 
@@ -72,7 +72,8 @@ function generateHost(options: CliOptions = {}): string {
  *
  * @returns {string} The port.
  */
-function generatePort(options: CliOptions = {}): string {
+function generatePort(options: CliOptions): string {
+  console.log(`in generatePort, options=${options.port}`);
   return options.port ? options.port : DEFAULT_PORT;
 }
 
@@ -97,7 +98,7 @@ function generateUri(options: CliOptions): string {
 
   // There is no URI provided, use default 127.0.0.1:27017
   if (!uri) {
-    return `${Scheme.Mongo}${generateHost()}:${generatePort()}`;
+    return `${Scheme.Mongo}${generateHost(options)}:${generatePort(options)}`;
   }
 
   // A mongodb:// or mongodb+srv:// URI is provided, treat as correct.