diff --git a/src/events/handleThreadMessage.ts b/src/events/handleThreadMessage.ts
index 9ccb708..66b996c 100644
--- a/src/events/handleThreadMessage.ts
+++ b/src/events/handleThreadMessage.ts
@@ -27,9 +27,14 @@ export const handleThreadMessage
     if (message.author.bot) {
       return;
     }
-    const owner = await message.thread?.fetchOwner();
-    // We only respond in threads created by Keiko.
-    if (owner?.id !== "1425897287065800785") {
+    const starter = await message.thread?.fetchStarterMessage();
+    const mentionsKeiko = starter?.mentions.has("1425897287065800785", {
+      ignoreDirect:      false,
+      ignoreEveryone:    true,
+      ignoreRepliedUser: true,
+      ignoreRoles:       true,
+    });
+    if (mentionsKeiko !== true) {
       return;
     }
     const isNaomi = await isNaomiMessage(message);