diff --git a/interface/src/app/main/Customizations.tsx b/interface/src/app/main/Customizations.tsx
index 99d042732..d975e6442 100644
--- a/interface/src/app/main/Customizations.tsx
+++ b/interface/src/app/main/Customizations.tsx
@@ -489,7 +489,8 @@ const Customizations = () => {
             </MenuItem>
             {devices.devices.map(
               (device: Device) =>
-                device.id < 90 && (
+                device.id < 90 &&
+                device.e !== 0 && (
                   <MenuItem key={device.id} value={device.id}>
                     {device.n}&nbsp;({device.tn})
                   </MenuItem>
diff --git a/interface/src/app/main/Devices.tsx b/interface/src/app/main/Devices.tsx
index 3b74cf11c..9916d2ea7 100644
--- a/interface/src/app/main/Devices.tsx
+++ b/interface/src/app/main/Devices.tsx
@@ -558,16 +558,26 @@ const Devices = memo(() => {
                       <CircularProgress sx={{ margin: 1 }} size={18} />
                     )}
                     {tableList.map((device: Device) => (
-                      <Row key={device.id} item={device}>
+                      <Row key={device.id} item={device} disabled={device.e === 0}>
                         <Cell>
                           <DeviceIcon type_id={device.t} />
                           &nbsp;&nbsp;
-                          {device.n}
-                          <span style={{ color: 'lightblue' }}>
-                            &nbsp;&nbsp;({device.e})
+                          <span style={{ color: device.e === 0 ? 'grey' : 'white' }}>
+                            {device.n}
                           </span>
+                          {device.e !== 0 && (
+                            <span style={{ color: 'lightblue' }}>
+                              &nbsp;&nbsp;({device.e})
+                            </span>
+                          )}
+                        </Cell>
+                        <Cell stiff>
+                          <ButtonTooltip
+                            title={`DeviceID: 0x${('00' + device.d.toString(16).toUpperCase()).slice(-2)}, ProductID: ${device.p}`}
+                          >
+                            <span>{device.tn}</span>
+                          </ButtonTooltip>
                         </Cell>
-                        <Cell stiff>{device.tn}</Cell>
                       </Row>
                     ))}
                   </Body>
diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp
index e9db9702d..1c29ff719 100644
--- a/src/web/WebDataService.cpp
+++ b/src/web/WebDataService.cpp
@@ -64,8 +64,6 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
     // list is already sorted by device type
     JsonArray devices = root["devices"].to<JsonArray>();
     for (const auto & emsdevice : EMSESP::emsdevices) {
-        // ignore controller and gateway
-        if (emsdevice && (emsdevice->device_type() != EMSdevice::DeviceType::CONTROLLER && emsdevice->device_type() != EMSdevice::DeviceType::GATEWAY && emsdevice->count_entities() > 0)) {
             JsonObject obj = devices.add<JsonObject>();
             obj["id"]      = emsdevice->unique_id();                            // a unique id
             obj["tn"]      = emsdevice->device_type_2_device_name_translated(); // translated device type name
@@ -77,7 +75,6 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
             obj["v"]       = emsdevice->version();                              // version
             obj["e"]       = emsdevice->count_entities();                       // number of entities
             obj["url"]     = emsdevice->device_type_name();                     // non-translated, lower-case, used for API URL in customization page
-        }
     }
 
     // add any custom entities