From f36ff376b87d39bbbd94bd9e351405a0778e2826 Mon Sep 17 00:00:00 2001
From: Martinnn674 <289372790+Martinnn674@users.noreply.github.com>
Date: Sun, 31 May 2026 13:16:23 +0200
Subject: [PATCH] Respect disabled shipped personas

---
 rooms/settings.py      | 2 +-
 tests/test_settings.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rooms/settings.py b/rooms/settings.py
index 53ccf13..f8f8cdc 100644
--- a/rooms/settings.py
+++ b/rooms/settings.py
@@ -196,7 +196,7 @@ def get_default_personas(settings: RoomsSettings) -> List[AgentConfig]:
         return [persona_settings_to_agent_config(p, settings.defaults) for p in settings.personas]
     if settings.use_shipped_personas:
         return _shipped_persona_dicts_to_configs(settings.defaults)
-    return _shipped_persona_dicts_to_configs(settings.defaults)
+    return []
 
 
 def resolve_preset_model(settings: RoomsSettings, preset_name: str) -> str:
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 095a55f..60a0106 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -57,6 +57,12 @@ def test_shipped_personas_use_defaults_model():
     assert personas[0].name == "Elena (The Lawyer)"
 
 
+def test_empty_personas_respects_disabled_shipped_personas():
+    settings = RoomsSettings(use_shipped_personas=False)
+    personas = get_default_personas(settings)
+    assert personas == []
+
+
 def test_custom_personas_from_yaml():
     settings = RoomsSettings(
         use_shipped_personas=False,