diff --git a/packages/api/src/providers/ActivityKeyer/ActivityKeyerComposer.tsx b/packages/api/src/providers/ActivityKeyer/ActivityKeyerComposer.tsx
index a6724c246f..c1e04de5a3 100644
--- a/packages/api/src/providers/ActivityKeyer/ActivityKeyerComposer.tsx
+++ b/packages/api/src/providers/ActivityKeyer/ActivityKeyerComposer.tsx
@@ -71,6 +71,7 @@ const ActivityKeyerComposer = ({ children }: Readonly<{ children?: ReactNode | u
         uniqueId();
 
       activityId && nextActivityIdToKeyMap.set(activityId, key);
+      typingActivityId && nextActivityIdToKeyMap.set(typingActivityId, key);
       clientActivityId && nextClientActivityIdToKeyMap.set(clientActivityId, key);
       nextActivityToKeyMap.set(activity, key);
       nextActivityKeys.add(key);