diff --git a/src/buddy/companionReact.ts b/src/buddy/companionReact.ts
index fb2e803e3..021167e0d 100644
--- a/src/buddy/companionReact.ts
+++ b/src/buddy/companionReact.ts
@@ -151,6 +151,10 @@ async function callBuddyReactAPI(
 
   if (!resp.ok) return null
 
-  const data = (await resp.json()) as { reaction?: string }
-  return data.reaction?.trim() || null
+  try {
+    const data = (await resp.json()) as { reaction?: string }
+    return data.reaction?.trim() || null
+  } catch {
+    return null
+  }
 }
diff --git a/src/commands/buddy/buddy.ts b/src/commands/buddy/buddy.ts
index e28826ef1..8d14ab4e6 100644
--- a/src/commands/buddy/buddy.ts
+++ b/src/commands/buddy/buddy.ts
@@ -102,7 +102,7 @@ export async function call(
     setState?.(prev => ({ ...prev, companionPetAt: Date.now() }))
 
     // Trigger a post-pet reaction
-    triggerCompanionReaction((context as any).messages ?? [], reaction =>
+    triggerCompanionReaction(context.messages ?? [], reaction =>
       setState?.(prev =>
         prev.companionReaction === reaction
           ? prev