diff --git a/packages/server/src/utils/federationWorker.ts b/packages/server/src/utils/federationWorker.ts
index 054afa0e..801a696b 100644
--- a/packages/server/src/utils/federationWorker.ts
+++ b/packages/server/src/utils/federationWorker.ts
@@ -139,6 +139,9 @@ async function processOutboxTick(): Promise<void> {
     .all();
 
   if (entries.length === 0) {
+    // No active-peer entries to deliver, but pending peers may still need
+    // handshake resolution. Always run resolvePendingPeers() before returning.
+    await resolvePendingPeers();
     return;
   }