diff --git a/mindspace-rybbit.mjs b/mindspace-rybbit.mjs
index 4d77aa9..95f3cc2 100644
--- a/mindspace-rybbit.mjs
+++ b/mindspace-rybbit.mjs
@@ -14,12 +14,13 @@ export function resolveMindSpaceRybbitConfig(
 ) {
   const enabled = String(env.MEMIND_RYBBIT_ENABLED ?? '').toLowerCase() === 'true';
   const siteId = String(env.MEMIND_RYBBIT_SITE_ID ?? '').trim();
-  const secret = String(
-    env.MEMIND_RYBBIT_ID_SECRET ??
-    env.MEMIND_ANALYTICS_ID_SECRET ??
-    idSecret ??
-    '',
-  ).trim();
+  const secret = [
+    env.MEMIND_RYBBIT_ID_SECRET,
+    env.MEMIND_ANALYTICS_ID_SECRET,
+    idSecret,
+  ]
+    .map((value) => String(value ?? '').trim())
+    .find(Boolean) ?? '';
   const rybbitUrl = String(env.MEMIND_RYBBIT_URL ?? env.RYBBIT_URL ?? 'https://rybbit.tkmind.cn').trim()
     || 'https://rybbit.tkmind.cn';
   return {
diff --git a/mindspace-rybbit.test.mjs b/mindspace-rybbit.test.mjs
index 58bc039..3d34743 100644
--- a/mindspace-rybbit.test.mjs
+++ b/mindspace-rybbit.test.mjs
@@ -30,6 +30,8 @@ test('rybbit config can reuse stored analytics secret', () => {
   const config = resolveMindSpaceRybbitConfig({
     MEMIND_RYBBIT_ENABLED: 'true',
     MEMIND_RYBBIT_SITE_ID: '2',
+    MEMIND_RYBBIT_ID_SECRET: '',
+    MEMIND_ANALYTICS_ID_SECRET: '',
   }, {
     idSecret: 'stored-secret',
   });