diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py
index 05e2cbe..b097059 100644
--- a/nanobot/cli/commands.py
+++ b/nanobot/cli/commands.py
@@ -244,7 +244,7 @@ def _make_provider(config: Config):
 @app.command()
 def gateway(
     port: int = typer.Option(18790, "--port", "-p", help="Gateway port"),
-    workspace: str | None = typer.Option(None, "--workspace", "-w", help="Workspace directory (default: ~/.nanobot/workspace)"),
+    workspace: str | None = typer.Option(None, "--workspace", "-w", help="Workspace directory"),
     config: str | None = typer.Option(None, "--config", "-c", help="Config file path"),
     verbose: bool = typer.Option(False, "--verbose", "-v", help="Verbose output"),
 ):
@@ -252,7 +252,7 @@ def gateway(
     from nanobot.agent.loop import AgentLoop
     from nanobot.bus.queue import MessageBus
     from nanobot.channels.manager import ChannelManager
-    from nanobot.config.loader import get_data_dir, load_config
+    from nanobot.config.loader import load_config
     from nanobot.cron.service import CronService
     from nanobot.cron.types import CronJob
     from nanobot.heartbeat.service import HeartbeatService
@@ -262,17 +262,12 @@ def gateway(
         import logging
         logging.basicConfig(level=logging.DEBUG)
 
-    # Load config from custom path if provided, otherwise use default
     config_path = Path(config) if config else None
     config = load_config(config_path)
-
-    # Override workspace if specified via command line
     if workspace:
         config.agents.defaults.workspace = workspace
 
     console.print(f"{__logo__} Starting nanobot gateway on port {port}...")
-
-    config = load_config()
     sync_workspace_templates(config.workspace_path)
     bus = MessageBus()
     provider = _make_provider(config)