diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js
index da1ecfcff..8525e2f1e 100644
--- a/src/controllers/dashboard/devices/devices.js
+++ b/src/controllers/dashboard/devices/devices.js
@@ -120,7 +120,7 @@ function load(page, devices) {
         }
 
         deviceHtml += "<div class='cardText'>";
-        deviceHtml += escapeHtml(device.Name);
+        deviceHtml += escapeHtml(device.CustomName || device.Name);
         deviceHtml += '</div>';
         deviceHtml += "<div class='cardText cardText-secondary'>";
         deviceHtml += escapeHtml(device.AppName + ' ' + device.AppVersion);