diff --git a/p2p/src/conn.rs b/p2p/src/conn.rs
index bce6edd9d..d1d5d8062 100644
--- a/p2p/src/conn.rs
+++ b/p2p/src/conn.rs
@@ -291,11 +291,11 @@ fn poll<H>(
 							.map(|a| a.to_string())
 							.unwrap_or("?".to_owned())
 					);
-					let _ = conn.shutdown(Shutdown::Both);
 					break;
 				}
 
 				thread::sleep(sleep_time);
 			}
+			let _ = conn.shutdown(Shutdown::Both);
 		});
 }
diff --git a/p2p/src/peer.rs b/p2p/src/peer.rs
index 91f93f986..4cfd7867e 100644
--- a/p2p/src/peer.rs
+++ b/p2p/src/peer.rs
@@ -526,7 +526,9 @@ impl TrackingAdapter {
 		if known.len() > MAX_TRACK_SIZE {
 			known.truncate(MAX_TRACK_SIZE);
 		}
-		known.insert(0, hash);
+		if !known.contains(&hash) {
+			known.insert(0, hash);
+		}
 	}
 }