diff --git a/supernote/cli/server.py b/supernote/cli/server.py
index b44f163..3bd0929 100644
--- a/supernote/cli/server.py
+++ b/supernote/cli/server.py
@@ -28,7 +28,7 @@ def serve_run(args: argparse.Namespace) -> None:
             # Set environment variables for the server process
             os.environ["SUPERNOTE_EPHEMERAL"] = "true"
             if not os.getenv("SUPERNOTE_PORT"):
-                os.environ["SUPERNOTE_PORT"] = "8080"
+                os.environ["SUPERNOTE_PORT"] = "8000"
             if not os.getenv("SUPERNOTE_HOST"):
                 os.environ["SUPERNOTE_HOST"] = "127.0.0.1"
             os.environ["SUPERNOTE_STORAGE_DIR"] = str(tmp_path)
diff --git a/supernote/server/config.py b/supernote/server/config.py
index 495238c..338eac4 100644
--- a/supernote/server/config.py
+++ b/supernote/server/config.py
@@ -60,7 +60,7 @@ class ServerConfig(DataClassYAMLMixin):
     Env Var: `SUPERNOTE_HOST`
     """
 
-    port: int = 8080
+    port: int = 8000
     """Port to bind the server to.
 
     Env Var: `SUPERNOTE_PORT`
@@ -73,7 +73,7 @@ class ServerConfig(DataClassYAMLMixin):
     """
 
     _base_url: str | None = field(default=None, metadata={"name": "base_url"})
-    """Base URL for the main server (port 8080).
+    """Base URL for the main server (port 8000).
     Used for generating links and for the MCP Authorization Server issuer.
     """