diff --git a/src/together/cli/api/endpoints.py b/src/together/cli/api/endpoints.py
index 271f864..bb2a9eb 100644
--- a/src/together/cli/api/endpoints.py
+++ b/src/together/cli/api/endpoints.py
@@ -137,8 +137,7 @@ def endpoints(ctx: click.Context) -> None:
     help="Start endpoint in specified availability zone (e.g., us-central-4b)",
 )
 @click.option(
-    "--wait",
-    is_flag=True,
+    "--wait/--no-wait",
     default=True,
     help="Wait for the endpoint to be ready after creation",
 )
@@ -284,7 +283,9 @@ def fetch_and_print_hardware_options(
 @endpoints.command()
 @click.argument("endpoint-id", required=True)
 @click.option(
-    "--wait", is_flag=True, default=True, help="Wait for the endpoint to stop"
+    "--wait/--no-wait",
+    default=True,
+    help="Wait for the endpoint to stop",
 )
 @click.pass_obj
 @handle_api_errors
@@ -307,7 +308,9 @@ def stop(client: Together, endpoint_id: str, wait: bool) -> None:
 @endpoints.command()
 @click.argument("endpoint-id", required=True)
 @click.option(
-    "--wait", is_flag=True, default=True, help="Wait for the endpoint to start"
+    "--wait/--no-wait",
+    default=True,
+    help="Wait for the endpoint to start",
 )
 @click.pass_obj
 @handle_api_errors