diff --git a/src/cli/cli-definitions.js b/src/cli/cli-definitions.js
index 6632d4ee..8f6e18ec 100644
--- a/src/cli/cli-definitions.js
+++ b/src/cli/cli-definitions.js
@@ -9,11 +9,6 @@ export default {
     help: "Your Parse Master Key",
     required: true
   },
-  "serverURL": { 
-    env: "PARSE_SERVER_URL",
-    help: "URL to your parse server with http:// or https://.",
-    required: true
-  },
   "port": {
      port: "PORT",
      help: "The port to run the ParseServer. defaults to 1337.",
@@ -30,6 +25,10 @@ export default {
     env: "PARSE_SERVER_DATABASE_URI",
     help: "The full URI to your mongodb database"
   },
+  "serverURL": { 
+    env: "PARSE_SERVER_URL",
+    help: "URL to your parse server with http:// or https://.",
+  },
   "clientKey": { 
     env: "PARSE_SERVER_CLIENT_KEY",
     help: "Key for iOS, MacOS, tvOS clients"
diff --git a/src/cli/parse-server.js b/src/cli/parse-server.js
index 65713aea..9713737a 100755
--- a/src/cli/parse-server.js
+++ b/src/cli/parse-server.js
@@ -34,6 +34,7 @@ program.on('--help', function(){
   
 program.parse(process.argv, process.env);
 
+let options;
 if (program.args.length > 0 ) {
   let jsonPath = program.args[0];
   jsonPath = path.resolve(jsonPath);
@@ -49,12 +50,16 @@ if (!program.appId || !program.masterKey || !program.serverURL) {
   process.exit(1);
 }
 
-let options = Object.keys(definitions).reduce(function (options, key) {
+options = Object.keys(definitions).reduce(function (options, key) {
   if (program[key]) {
     options[key] = program[key];
   }
   return options;
-}, {});
+}, options);
+
+if (!options.serverURL) {
+  options.serverURL = `http://localhost:${options.port}${options.mountPath}`;
+}
 
 const app = express();
 const api = new ParseServer(options);
@@ -70,5 +75,5 @@ app.listen(options.port, function() {
     console.log(`${key}: ${value}`);
   }
   console.log('');
-  console.log('parse-server running on http://localhost:'+ options.port + options.mountPath);
+  console.log('parse-server running on '+options.serverURL);
 });