diff --git a/wwwroot/knowledge_bases_list/kb_options.dspy b/wwwroot/knowledge_bases_list/kb_options.dspy
index 81b0c09..dff45b7 100644
--- a/wwwroot/knowledge_bases_list/kb_options.dspy
+++ b/wwwroot/knowledge_bases_list/kb_options.dspy
@@ -1,6 +1,9 @@
 import json
 env = request._run_ns
+userorgid = await env.get_userorgid()
 async with get_sor_context(env, 'rag') as sor:
-    recs = await sor.sqlExe("SELECT id, name FROM knowledge_bases WHERE org_id IS NULL OR org_id='0' ORDER BY created_at DESC", {})
+    recs = await sor.sqlExe(
+        "SELECT id, name FROM knowledge_bases WHERE org_id=${org_id}$ ORDER BY created_at DESC",
+        {"org_id": userorgid})
     items = [{"value": r.id, "text": r.name} for r in recs]
     return json.dumps(items, ensure_ascii=False)