diff --git a/backend/app/api/agents.py b/backend/app/api/agents.py
index 0f8f1bc41..298893e31 100644
--- a/backend/app/api/agents.py
+++ b/backend/app/api/agents.py
@@ -336,8 +336,13 @@ async def create_agent(
                 file_path.parent.mkdir(parents=True, exist_ok=True)
                 file_path.write_text(sf.content, encoding="utf-8")
 
-    # Start container
-    await agent_manager.start_container(db, agent)
+    if agent.agent_type == "openclaw":
+        # Start container
+        await agent_manager.start_container(db, agent)
+    else:
+        # Native Agent. No container needs to be started
+        agent.status = "idle"
+        agent.last_active_at = datetime.now(timezone.utc)
     await db.flush()
 
     return AgentOut.model_validate(agent)