diff --git a/router/xgress_edge/listener.go b/router/xgress_edge/listener.go
index 76f3bea4c..c4a3b9312 100644
--- a/router/xgress_edge/listener.go
+++ b/router/xgress_edge/listener.go
@@ -153,7 +153,10 @@ func (proxy *ingressProxy) processConnect(req *channel2.Message, ch channel2.Cha
 	// fabric connect
 	log.Debug("dialing fabric")
 	peerData := make(map[uint32][]byte)
-	peerData[edge.PublicKeyHeader] = req.Headers[edge.PublicKeyHeader]
+
+	if pk, found := req.Headers[edge.PublicKeyHeader]; found {
+		peerData[edge.PublicKeyHeader] = pk
+	}
 
 	if callerId, found := req.Headers[edge.CallerIdHeader]; found {
 		peerData[edge.CallerIdHeader] = callerId