diff --git a/p2p/net/conn-security-multistream/ssms.go b/p2p/net/conn-security-multistream/ssms.go
index 312b775cd3..b74b749938 100644
--- a/p2p/net/conn-security-multistream/ssms.go
+++ b/p2p/net/conn-security-multistream/ssms.go
@@ -82,6 +82,7 @@ func (sm *SSMuxer) selectProto(ctx context.Context, insecure net.Conn, server bo
 		// We *must* do this. We have outstanding work on the connection
 		// and it's no longer safe to use.
 		insecure.Close()
+		<-done // wait to stop using the connection.
 		return nil, ctx.Err()
 	}
 }