diff --git a/wwwroot/knowledge_bases_list/delete_kb.dspy b/wwwroot/knowledge_bases_list/delete_kb.dspy
index 76808c5..75b87bc 100644
--- a/wwwroot/knowledge_bases_list/delete_kb.dspy
+++ b/wwwroot/knowledge_bases_list/delete_kb.dspy
@@ -11,7 +11,7 @@ deleted = {"documents": 0, "chunks": 0, "tags": 0, "media_tags": 0, "files": 0}
 async with get_sor_context(env, 'rag') as sor:
     # Check owner
     kb = await sor.sqlExe(
-        "SELECT id, name FROM knowledge_bases WHERE id=${id}$ AND org_id=${org_id}$",
+        "SELECT id, name FROM knowledge_bases WHERE id=${id}$ AND (org_id=${org_id}$ OR org_id IS NULL)",
         {"id": kb_id, "org_id": userorgid})
     if not kb:
         return json.dumps({"status": "error", "error": "knowledge base not found or access denied"}, ensure_ascii=False)
diff --git a/wwwroot/knowledge_bases_list/rename_kb.dspy b/wwwroot/knowledge_bases_list/rename_kb.dspy
index af6e036..f0bdc26 100644
--- a/wwwroot/knowledge_bases_list/rename_kb.dspy
+++ b/wwwroot/knowledge_bases_list/rename_kb.dspy
@@ -12,7 +12,7 @@ userorgid = await env.get_userorgid()
 async with get_sor_context(env, 'rag') as sor:
     await sor.sqlExe(
         "UPDATE knowledge_bases SET name=${name}$, description=${desc}$, updated_at=NOW() "
-        "WHERE id=${id}$ AND org_id=${org_id}$",
+        "WHERE id=${id}$ AND (org_id=${org_id}$ OR org_id IS NULL)",
         {"name": name, "desc": desc, "id": kb_id, "org_id": userorgid})
 
 # Reload KB list page