diff --git a/controllers/eclair/channels.js b/controllers/eclair/channels.js
index c099a72f..748e1311 100644
--- a/controllers/eclair/channels.js
+++ b/controllers/eclair/channels.js
@@ -1,7 +1,6 @@
 var request = require('request-promise');
 var common = require('../../common');
 var logger = require('../logger');
-const { resolve } = require('path');
 var options = {};
 
 simplifyAllChannels = (channels) => {
@@ -27,10 +26,13 @@ simplifyAllChannels = (channels) => {
   return new Promise(function(resolve, reject) {
     options.url = common.getSelLNServerUrl() + '/nodes';
     options.form = { nodeIds: channelNodeIds };
+    logger.info({fileName: 'Channels', msg: 'Node Ids to find alias: ' + channelNodeIds});
     request.post(options).then(function(nodes) {
       logger.info({fileName: 'Channels', msg: 'Filtered Nodes: ' + JSON.stringify(nodes)});
+      let foundPeer = {};
       simplifiedChannels.map(channel => {
-        channel.alias = nodes.find(channelWithAlias => channel.nodeId === channelWithAlias.nodeId).alias;
+        foundPeer = nodes.find(channelWithAlias => channel.nodeId === channelWithAlias.nodeId);
+        channel.alias = foundPeer ? foundPeer.alias : channel.nodeId.substring(0, 20);
       });
       resolve(simplifiedChannels);
     }).catch(err => {
diff --git a/controllers/eclair/peers.js b/controllers/eclair/peers.js
index 2cf90aab..4d41dd11 100644
--- a/controllers/eclair/peers.js
+++ b/controllers/eclair/peers.js
@@ -30,7 +30,7 @@ exports.getPeers = (req, res, next) => {
         let foundPeer = {};
         body.map(peer => {
           foundPeer = peersWithAlias.find(peerWithAlias => peer.nodeId === peerWithAlias.nodeId);
-          peer.alias = foundPeer ? foundPeer.alias : '';
+          peer.alias = foundPeer ? foundPeer.alias : peer.nodeId.substring(0, 20);
         });
         body = common.sortDescByStrKey(body, 'alias');
         logger.info({fileName: 'Peers', msg: 'Peers with Alias: ' + JSON.stringify(body)});
@@ -81,8 +81,10 @@ exports.connectPeer = (req, res, next) => {
         body.forEach(peer => { peersNodeIds = peersNodeIds + ',' + peer.nodeId; });
         peersNodeIds = peersNodeIds.substring(1);
         getFilteredNodes(peersNodeIds).then(function(peersWithAlias) {
+          let foundPeer = {};
           body.map(peer => {
-            peer.alias = peersWithAlias.find(peerWithAlias => peer.nodeId === peerWithAlias.nodeId).alias;
+            foundPeer = peersWithAlias.find(peerWithAlias => peer.nodeId === peerWithAlias.nodeId);
+            peer.alias = foundPeer ? foundPeer.alias : peer.nodeId.substring(0, 20);
           });
           let peers = (body) ? common.sortDescByStrKey(body, 'alias') : [];
           peers = common.newestOnTop(peers, 'nodeId', req.query.uri ? req.query.uri.substring(0, req.query.uri.indexOf('@')) : req.query.nodeId ? req.query.nodeId : '');