diff --git a/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap b/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap
index 4212766d..8de5fc00 100644
--- a/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap
+++ b/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap
@@ -2095,7 +2095,6 @@ dependencies = [
     "mcp >= 1.19.0",
     "langchain-mcp-adapters >= 0.1.11",
     "langchain >= 1.0.3",
-    "tiktoken == 0.11.0",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
 {{#if (eq modelProvider "Bedrock")}}
diff --git a/src/assets/python/langchain_langgraph/base/pyproject.toml b/src/assets/python/langchain_langgraph/base/pyproject.toml
index f3b26fe2..2fd6401a 100644
--- a/src/assets/python/langchain_langgraph/base/pyproject.toml
+++ b/src/assets/python/langchain_langgraph/base/pyproject.toml
@@ -15,7 +15,6 @@ dependencies = [
     "mcp >= 1.19.0",
     "langchain-mcp-adapters >= 0.1.11",
     "langchain >= 1.0.3",
-    "tiktoken == 0.11.0",
     "bedrock-agentcore >= 1.0.3",
     "botocore[crt] >= 1.35.0",
 {{#if (eq modelProvider "Bedrock")}}
diff --git a/src/cli/tui/hooks/useDevServer.ts b/src/cli/tui/hooks/useDevServer.ts
index 9506cf9a..61230c84 100644
--- a/src/cli/tui/hooks/useDevServer.ts
+++ b/src/cli/tui/hooks/useDevServer.ts
@@ -87,7 +87,7 @@ export function useDevServer(options: { workingDir: string; port: number; agentN
   }, [options.workingDir]);
 
   const config: DevConfig | null = useMemo(() => {
-    if (!project) {
+    if (!project || !options.agentName) {
       return null;
     }
     return getDevConfig(options.workingDir, project, configRoot, options.agentName);
diff --git a/src/schema/constants.ts b/src/schema/constants.ts
index dc385981..70709119 100644
--- a/src/schema/constants.ts
+++ b/src/schema/constants.ts
@@ -95,7 +95,6 @@ export const RESERVED_PROJECT_NAMES: readonly string[] = [
   'pytest',
   'pytestasyncio',
   'pythondotenv',
-  'tiktoken',
   // Build tools
   'hatchling',
   'setuptools',