diff --git a/CLAUDE.md b/CLAUDE.md
index d7c67f65..eca2f19c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -22,7 +22,8 @@ Multica is an AI-native task management platform — like Linear, but with AI ag
 
 ```bash
 # One-click setup & run
-make setup            # First-time: install deps, start DB, migrate, seed
+make setup            # First-time: install deps, start DB, migrate
+make seed             # Optional: load example data
 make start            # Start backend + frontend together
 make stop             # Stop everything
 
@@ -40,7 +41,7 @@ make test             # Go tests
 make sqlc             # Regenerate sqlc code
 make migrate-up       # Run database migrations
 make migrate-down     # Rollback migrations
-make seed             # Seed sample data
+make seed             # Seed example data
 
 # Infrastructure
 docker compose up -d  # Start PostgreSQL
diff --git a/Makefile b/Makefile
index 8f36b591..0b99e759 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ COMPOSE := docker compose --env-file $(ENV_FILE)
 
 # ---------- One-click commands ----------
 
-# First-time setup: install deps, start DB, run migrations, seed data
+# First-time setup: install deps, start DB, run migrations
 setup:
 	@echo "==> Using env file: $(ENV_FILE)"
 	@echo "==> Installing dependencies..."
@@ -45,10 +45,8 @@ setup:
 	fi
 	@echo "==> Running migrations..."
 	cd server && go run ./cmd/migrate up
-	@echo "==> Seeding data..."
-	cd server && go run ./cmd/seed
 	@echo ""
-	@echo "✓ Setup complete! Run 'make start' to launch the app."
+	@echo "✓ Setup complete! Run 'make seed' if you want example data, then 'make start' to launch the app."
 
 # Start all services (backend + frontend)
 start:
diff --git a/README.md b/README.md
index 968cd110..3cc64671 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,13 @@ pnpm install
 # 2. Copy environment variables for the shared main environment
 cp .env.example .env
 
-# 3. One-time setup: start DB, run migrations, seed data
+# 3. One-time setup: start DB and run migrations
 make setup
 
-# 4. Start backend + frontend
+# 4. Optional: load example data
+make seed
+
+# 5. Start backend + frontend
 make start
 ```
 
@@ -88,7 +91,7 @@ This lets you keep `.env` connected to your main database while using `.env.work
 | `docker compose down` | Stop PostgreSQL |
 | `make migrate-up` | Run database migrations |
 | `make migrate-down` | Rollback database migrations |
-| `make seed` | Seed test data |
+| `make seed` | Seed example data |
 | `make worktree-env` | Generate an isolated `.env.worktree` for the current worktree |
 | `make setup-main` / `make start-main` | Force use of the shared main `.env` |
 | `make setup-worktree` / `make start-worktree` | Force use of isolated `.env.worktree` |