diff --git a/lib/net/pool.js b/lib/net/pool.js
index 5e3918e9..98f1389a 100644
--- a/lib/net/pool.js
+++ b/lib/net/pool.js
@@ -1030,16 +1030,18 @@ Pool.prototype.createPeer = function createPeer(addr, socket) {
   var peer = new bcoin.peer(this, addr, socket);
 
   peer.once('close', function() {
-    self.removePeer(peer);
-
-    if (!self.loaded)
+    if (!self.loaded) {
+      self.removePeer(peer);
       return;
+    }
 
     if (!peer.isLoader()) {
+      self.removePeer(peer);
       self.fillPeers();
       return;
     }
 
+    self.removePeer(peer);
     self.stopInterval();
     self.stopTimeout();