diff --git a/go/topology/data_node.go b/go/topology/data_node.go
index 2d0a093cc..c7d04d953 100644
--- a/go/topology/data_node.go
+++ b/go/topology/data_node.go
@@ -87,6 +87,9 @@ func (dn *DataNode) MatchLocation(ip string, port int) bool {
 }
 
 func (dn *DataNode) Url() string {
+	if dn.PublicUrl != "" {
+		return dn.PublicUrl
+	}
 	return dn.Ip + ":" + strconv.Itoa(dn.Port)
 }