diff --git a/packages/server/src/routes/federation.ts b/packages/server/src/routes/federation.ts
index d32727bc..febe32da 100644
--- a/packages/server/src/routes/federation.ts
+++ b/packages/server/src/routes/federation.ts
@@ -1213,6 +1213,12 @@ export function processRelayEvents(
         case 'dm_call_end':
           processDmCallEndEvent(event, sourceInstance, db, accepted, rejected);
           break;
+        case 'dm_typing_start':
+          processDmTypingStartEvent(event, sourceInstance, db, accepted, rejected);
+          break;
+        case 'dm_typing_stop':
+          processDmTypingStopEvent(event, sourceInstance, db, accepted, rejected);
+          break;
         default:
           rejected.push({ messageId: event.messageId, reason: 'unknown_event_type' });
           break;
@@ -1762,6 +1768,23 @@ function processCreateEvent(
     }
   }
 
+  // Belt-and-suspenders: clear typing indicator for the author on inbound relay.
+  // This catches the case where the explicit dm_typing_stop relay was lost.
+  const relayDmMembers = db.select()
+    .from(schema.dmMembers)
+    .where(eq(schema.dmMembers.dmChannelId, localDmChannelId))
+    .all();
+
+  for (const member of relayDmMembers) {
+    if (member.userId !== authorUser.id) {
+      connectionManager.sendToUser(member.userId, {
+        type: 'dm_typing_stop',
+        dmChannelId: localDmChannelId,
+        userId: authorUser.id,
+      });
+    }
+  }
+
   accepted.push(event.messageId);
 }
 
@@ -3392,6 +3415,113 @@ function processDmCallEndEvent(
   accepted.push(event.messageId);
 }
 
+function processDmTypingStartEvent(
+  event: FederationRelayEvent,
+  sourceInstance: string,
+  db: ReturnType<typeof getDb>,
+  accepted: string[],
+  rejected: Array<{ messageId: string; reason: string }>,
+): void {
+  if (!event.typing || !event.federatedId) {
+    rejected.push({ messageId: event.messageId, reason: 'missing_typing_payload' });
+    return;
+  }
+
+  // Look up local channel by federatedId
+  const channel = db.select()
+    .from(schema.dmChannels)
+    .where(and(
+      eq(schema.dmChannels.federatedId, event.federatedId),
+      isNull(schema.dmChannels.deletedAt),
+    ))
+    .get();
+
+  if (!channel) {
+    // Channel not bootstrapped yet — discard silently
+    accepted.push(event.messageId);
+    return;
+  }
+
+  // Resolve the typing user (read-only — don't create stubs for ephemeral events)
+  const typingUser = resolveLocalUser(event.typing.homeUserId, db);
+  if (!typingUser) {
+    // User stub doesn't exist — discard silently
+    accepted.push(event.messageId);
+    return;
+  }
+
+  // Broadcast dm_typing to local DM members (excluding the typer)
+  const dmMembers = db.select()
+    .from(schema.dmMembers)
+    .where(eq(schema.dmMembers.dmChannelId, channel.id))
+    .all();
+
+  for (const member of dmMembers) {
+    if (member.userId !== typingUser.id) {
+      connectionManager.sendToUser(member.userId, {
+        type: 'dm_typing',
+        dmChannelId: channel.id,
+        userId: typingUser.id,
+        username: typingUser.username ?? event.typing.username,
+      });
+    }
+  }
+
+  accepted.push(event.messageId);
+}
+
+function processDmTypingStopEvent(
+  event: FederationRelayEvent,
+  sourceInstance: string,
+  db: ReturnType<typeof getDb>,
+  accepted: string[],
+  rejected: Array<{ messageId: string; reason: string }>,
+): void {
+  if (!event.typing || !event.federatedId) {
+    rejected.push({ messageId: event.messageId, reason: 'missing_typing_payload' });
+    return;
+  }
+
+  // Look up local channel by federatedId
+  const channel = db.select()
+    .from(schema.dmChannels)
+    .where(and(
+      eq(schema.dmChannels.federatedId, event.federatedId),
+      isNull(schema.dmChannels.deletedAt),
+    ))
+    .get();
+
+  if (!channel) {
+    accepted.push(event.messageId);
+    return;
+  }
+
+  // Resolve the typing user (read-only)
+  const typingUser = resolveLocalUser(event.typing.homeUserId, db);
+  if (!typingUser) {
+    accepted.push(event.messageId);
+    return;
+  }
+
+  // Broadcast dm_typing_stop to local DM members
+  const dmMembers = db.select()
+    .from(schema.dmMembers)
+    .where(eq(schema.dmMembers.dmChannelId, channel.id))
+    .all();
+
+  for (const member of dmMembers) {
+    if (member.userId !== typingUser.id) {
+      connectionManager.sendToUser(member.userId, {
+        type: 'dm_typing_stop',
+        dmChannelId: channel.id,
+        userId: typingUser.id,
+      });
+    }
+  }
+
+  accepted.push(event.messageId);
+}
+
 /**
  * Fan out a call event to all remote instances with DM members,
  * optionally excluding the instance that triggered the event.