diff --git a/p2p/discover/portal_protocol.go b/p2p/discover/portal_protocol.go
index 5547e58a26..f6cb8c7ae9 100644
--- a/p2p/discover/portal_protocol.go
+++ b/p2p/discover/portal_protocol.go
@@ -1152,7 +1152,7 @@ func (p *PortalProtocol) handleFindContent(id enode.ID, addr *net.UDPAddr, reque
 			var connectCtx context.Context
 			var cancel context.CancelFunc
 			defer func() {
-				p.connIdGen.Remove(connId)
+				p.connIdGen.Remove(connectionId)
 				if conn == nil {
 					return
 				}
@@ -1284,7 +1284,7 @@ func (p *PortalProtocol) handleOffer(id enode.ID, addr *net.UDPAddr, request *po
 			var connectCtx context.Context
 			var cancel context.CancelFunc
 			defer func() {
-				p.connIdGen.Remove(connId)
+				p.connIdGen.Remove(connectionId)
 				if conn == nil {
 					return
 				}