diff --git a/p2p/server.go b/p2p/server.go
index dd15746e2f..1ed1be2ac6 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -326,6 +326,9 @@ func (srv *Server) AddPeer(node *enode.Node) {
 
 // RemovePeer removes a node from the static node set. It also disconnects from the given
 // node if it is currently connected as a peer.
+//
+// This method blocks until all protocols have exited and the peer is removed. Do not use
+// RemovePeer in protocol implementations, call Disconnect on the Peer instead.
 func (srv *Server) RemovePeer(node *enode.Node) {
 	var (
 		ch  chan *PeerEvent