diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py
index 9cb1b08eeec..5902c1bd217 100644
--- a/wandb/cli/cli.py
+++ b/wandb/cli/cli.py
@@ -242,7 +242,7 @@ def login(key, host, cloud, relogin, anonymously, no_offline=False):
 @cli.command(
     context_settings=CONTEXT, help="Run a grpc server", name="grpc-server", hidden=True
 )
-@click.option("--port", "-p", default=None, help="The port to use.")
+@click.option("--port", default=None, help="The host port to bind grpc service.")
 @display_error
 def grpc_server(project=None, entity=None, port=None):
     _ = util.get_module(
diff --git a/wandb/server/grpc_server.py b/wandb/server/grpc_server.py
index 3db2e0fe87c..1f40c0bd7aa 100755
--- a/wandb/server/grpc_server.py
+++ b/wandb/server/grpc_server.py
@@ -170,7 +170,7 @@ def serve(backend, port):
         wandb_server_pb2_grpc.add_InternalServiceServicer_to_server(
             InternalServiceServicer(server, backend), server
         )
-        server.add_insecure_port(f"[::]:{port}")
+        server.add_insecure_port("[::]:{}".format(port))
         server.start()
         server.wait_for_termination()
         # print("server shutting down")
@@ -179,12 +179,12 @@ def serve(backend, port):
         print("control-c")
 
 
-def main(port=50051):
+def main(port=None):
     try:
         logging.basicConfig()
         backend = Backend()
         backend.setup()
-        serve(backend, port if port is not None else 50051)
+        serve(backend, port or 50051)
     except KeyboardInterrupt:
         print("outer control-c")