diff --git a/lib/util/utils.js b/lib/util/utils.js
index ddb20719f..374a13a33 100644
--- a/lib/util/utils.js
+++ b/lib/util/utils.js
@@ -26,7 +26,8 @@ function resolveEntity(ID) {
     } else {
         // By default it is a device with ID as ID.
         type = 'device';
-        friendlyName = ID;
+        const device = settings.getDevice(ID);
+        friendlyName = device ? device.friendly_name : ID;
     }
 
     return {ID: ID, type: type, friendlyName: friendlyName};