diff --git a/diagnostic/server.js b/diagnostic/server.js
index 535a9f8..d0ef2a1 100644
--- a/diagnostic/server.js
+++ b/diagnostic/server.js
@@ -1322,7 +1322,7 @@ async function resolveActiveSession() {
   if (entries.length === 0) return;
 
   // Vorhandene Keys loggen
-  const keys = entries.map(e => e.key || e.sessionKey || e.name || "?");
+  const keys = entries.map(e => (e.key || e.sessionKey || e.name || "?").replace(/^agent:main:/, ""));
   log("info", "server", `Verfuegbare Sessions: [${keys.join(", ")}]`);
 
   // Neueste Session nehmen
@@ -1337,7 +1337,8 @@ async function resolveActiveSession() {
   }
 
   if (newest) {
-    const key = newest.key || newest.sessionKey || newest.name || "";
+    const rawKey = newest.key || newest.sessionKey || newest.name || "";
+    const key = rawKey.replace(/^agent:main:/, "");
     if (key) {
       activeSessionKey = key;
       try { fs.writeFileSync(SESSION_KEY_FILE, activeSessionKey); } catch {}
@@ -1364,7 +1365,8 @@ async function handleLoadChatHistory(clientWs) {
     let sessionId = null;
     const availableKeys = [];
     for (const entry of entries) {
-      const key = entry.key || entry.sessionKey || entry.name || "";
+      const rawKey = entry.key || entry.sessionKey || entry.name || "";
+      const key = rawKey.replace(/^agent:main:/, "");
       availableKeys.push(key);
       if (key === activeSessionKey) {
         sessionId = entry.id || entry.sessionId || "";