diff --git a/src/index.ts b/src/index.ts
index f507add..3dd402b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -339,6 +339,8 @@ async function handleStatus(aq: ActiveQuery) {
     peersListener,
   );
 
+  ipfs.libp2p.addEventListener("start", peersListener);
+
   aq.setReceiveUpdate?.(() => {
     peerEvents.forEach((ev) => {
       // @ts-ignore
@@ -347,6 +349,7 @@ async function handleStatus(aq: ActiveQuery) {
         peersListener,
       );
     });
+    ipfs.libp2p.removeEventListener("start", peersListener);
     aq.respond();
   });