diff --git a/gossipsub.go b/gossipsub.go
index 5a02f63..03cd928 100644
--- a/gossipsub.go
+++ b/gossipsub.go
@@ -68,6 +68,8 @@ func (gs *GossipSubRouter) RemovePeer(p peer.ID) {
 	for _, peers := range gs.fanout {
 		delete(peers, p)
 	}
+	delete(gs.gossip, p)
+	delete(gs.control, p)
 }
 
 func (gs *GossipSubRouter) HandleRPC(rpc *RPC) {