diff --git a/js/app/map/map.js b/js/app/map/map.js
index 32b1baaa..91bce281 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -1634,10 +1634,10 @@ define([
             id: id ? id : 0,
             source: parseInt( source.data('id') ),
             sourceName: source.data('name'),
-            sourceAlias: source.getSystemInfo(['alias']),
+            sourceAlias: source.getSystemInfo(['alias']) || source.data('name'),
             target: parseInt( target.data('id') ),
             targetName: target.data('name'),
-            targetAlias: target.getSystemInfo(['alias']),
+            targetAlias: target.getSystemInfo(['alias']) || target.data('name'),
             scope: connection.scope,
             type: connectionTypes,
             updated: updated ? updated : 0
diff --git a/public/js/v1.2.3/app/map/map.js b/public/js/v1.2.3/app/map/map.js
index 32b1baaa..91bce281 100644
--- a/public/js/v1.2.3/app/map/map.js
+++ b/public/js/v1.2.3/app/map/map.js
@@ -1634,10 +1634,10 @@ define([
             id: id ? id : 0,
             source: parseInt( source.data('id') ),
             sourceName: source.data('name'),
-            sourceAlias: source.getSystemInfo(['alias']),
+            sourceAlias: source.getSystemInfo(['alias']) || source.data('name'),
             target: parseInt( target.data('id') ),
             targetName: target.data('name'),
-            targetAlias: target.getSystemInfo(['alias']),
+            targetAlias: target.getSystemInfo(['alias']) || target.data('name'),
             scope: connection.scope,
             type: connectionTypes,
             updated: updated ? updated : 0