diff --git a/p2p/src/conn.rs b/p2p/src/conn.rs
index 7bff66dc9..394902fd3 100644
--- a/p2p/src/conn.rs
+++ b/p2p/src/conn.rs
@@ -181,18 +181,17 @@ impl StopHandle {
 		}
 	}
 
-	pub fn stop_and_wait(&mut self) {
-		self.stop();
+	pub fn wait(&mut self) {
 		if let Some(peer_thread) = self.peer_thread.take() {
 			// wait only if other thread is calling us, eg shutdown
 			if thread::current().id() != peer_thread.thread().id() {
 				debug!("waiting for thread {:?} exit", peer_thread.thread().id());
 				if let Err(e) = peer_thread.join() {
-					error!("failed to stop peer thread: {:?}", e);
+					error!("failed to wait for peer thread to stop: {:?}", e);
 				}
 			} else {
 				debug!(
-					"attempt to stop thread {:?} from itself",
+					"attempt to wait for thread {:?} from itself",
 					peer_thread.thread().id()
 				);
 			}
diff --git a/p2p/src/peer.rs b/p2p/src/peer.rs
index 46bdda9f6..f1d5fc85c 100644
--- a/p2p/src/peer.rs
+++ b/p2p/src/peer.rs
@@ -397,18 +397,18 @@ impl Peer {
 
 	/// Stops the peer
 	pub fn stop(&self) {
-		debug!("Stopping peer without waiting {:?}", self.info.addr);
+		debug!("Stopping peer {:?}", self.info.addr);
 		match self.stop_handle.try_lock() {
 			Some(handle) => handle.stop(),
 			None => error!("can't get stop lock for peer"),
 		}
 	}
 
-	/// Stops the peer and wait until peer's thread exit
-	pub fn stop_and_wait(&self) {
-		debug!("Stopping peer {:?}", self.info.addr);
+	/// Waits until the peer's thread exit
+	pub fn wait(&self) {
+		debug!("Waiting for peer {:?} to stop", self.info.addr);
 		match self.stop_handle.try_lock() {
-			Some(mut handle) => handle.stop_and_wait(),
+			Some(mut handle) => handle.wait(),
 			None => error!("can't get stop lock for peer"),
 		}
 	}
diff --git a/p2p/src/peers.rs b/p2p/src/peers.rs
index 36bfe018e..a8668aade 100644
--- a/p2p/src/peers.rs
+++ b/p2p/src/peers.rs
@@ -510,8 +510,11 @@ impl Peers {
 
 	pub fn stop(&self) {
 		let mut peers = self.peers.write();
+		for peer in peers.values() {
+			peer.stop();
+		}
 		for (_, peer) in peers.drain() {
-			peer.stop_and_wait();
+			peer.wait();
 		}
 	}