diff --git a/app/lib/dal/indexDAL/loki/LokiPeer.ts b/app/lib/dal/indexDAL/loki/LokiPeer.ts
index 7aef11957088093557789c6e59e6e0cc1778a6bd..c067aa2976b1379e0b8548677a4c44f0f329b2d8 100644
--- a/app/lib/dal/indexDAL/loki/LokiPeer.ts
+++ b/app/lib/dal/indexDAL/loki/LokiPeer.ts
@@ -8,6 +8,11 @@ export class LokiPeer extends LokiCollectionManager<DBPeer> implements PeerDAO {
     super(loki, 'peer', ['pubkey'])
   }
 
+  async init(): Promise<void> {
+    await super.init();
+    this.cleanEmptyPeers()
+  }
+
   cleanCache(): void {
   }
 
@@ -84,6 +89,14 @@ export class LokiPeer extends LokiCollectionManager<DBPeer> implements PeerDAO {
       .remove()
   }
 
+  async cleanEmptyPeers(): Promise<void> {
+    this.collection
+      .chain()
+      .find({})
+      .where(p => !p.endpoints || !p.endpoints.length)
+      .remove()
+  }
+
   async getPeersWithEndpointsLike(ep: string): Promise<DBPeer[]> {
     return this.collection
       .chain()