diff --git a/src/headless.ts b/src/headless.ts
index 8964143..1be0b34 100644
--- a/src/headless.ts
+++ b/src/headless.ts
@@ -631,6 +631,7 @@ export async function handleHeadlessCommand(
   }
 
   // Apply memfs flag if specified, or enable by default for new agents
+  // In headless mode, also enable for --agent since users expect full functionality
   if (memfsFlag) {
     settingsManager.setMemfsEnabled(agent.id, true);
   } else if (noMemfsFlag) {
@@ -638,6 +639,9 @@ export async function handleHeadlessCommand(
   } else if (isNewlyCreatedAgent && !isSubagent) {
     // Enable memfs by default for newly created agents (but not subagents)
     settingsManager.setMemfsEnabled(agent.id, true);
+  } else if (specifiedAgentId && !isSubagent) {
+    // Enable memfs by default when using --agent in headless mode
+    settingsManager.setMemfsEnabled(agent.id, true);
   }
 
   // Sync filesystem-backed memory before creating conversations (only if memfs is enabled)