diff --git a/p2p/server.go b/p2p/server.go
index 29eca6c..96cf32c 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -614,16 +614,7 @@ func (srv *Server) setupConn(fd net.Conn, flags connFlag, dialDest *discover.Nod
 		c.close(errServerStopped)
 		return
 	}
-	timeout := time.NewTimer(dialHistoryExpiration * 9)
-	defer timeout.Stop()
-	go func() {
-		select {
-		case <-timeout.C:
-			c.close(DiscReadTimeout)
-		case <-srv.quit:
-			c.close(errServerStopped)
-		}
-	}()
+
 	// Run the encryption handshake.
 	var err error
 	if c.id, err = c.doEncHandshake(srv.PrivateKey, dialDest); err != nil {
diff --git a/protocol/handler.go b/protocol/handler.go
index f67a7b7..da35f2e 100644
--- a/protocol/handler.go
+++ b/protocol/handler.go
@@ -207,13 +207,6 @@ func (pm *ProtocolManager) handle(p *peer) error {
 // peer. The remote connection is torn down upon returning any error.
 func (pm *ProtocolManager) handleMsg(p *peer) error {
 	// Read the next message from the remote peer, and ensure it's fully consumed
-	go func() {
-		select {
-		case <-pm.quitSync:
-			p.Disconnect(ErrNoStatusMsg)
-		}
-	}()
-
 	msg, err := p.rw.ReadMsg()
 	if err != nil {
 		return err