diff --git a/tasmota/tasmota_support/support.ino b/tasmota/tasmota_support/support.ino
index 76f5ac099..b9619a90c 100755
--- a/tasmota/tasmota_support/support.ino
+++ b/tasmota/tasmota_support/support.ino
@@ -844,9 +844,7 @@ void DevicesPresentNonDisplayOrLight(uint32_t &devices_claimed) {
   display_and_lights += LightDevices();               // Skip light(s)
 #endif  // USE_LIGHT
 #ifdef USE_DISPLAY
-  if (disp_device) {
-    display_and_lights++;                             // Skip display
-  }
+  display_and_lights += DisplayDevices();             // Skip display
 #endif  // USE_DISPLAY
   uint32_t devices_present = TasmotaGlobal.devices_present - display_and_lights;
   if (devices_claimed > devices_present) {
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino b/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
index 33a445527..8096c4eaf 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
@@ -269,6 +269,12 @@ bool disp_subscribed = false;
 
 /*********************************************************************************************/
 
+uint32_t DisplayDevices(void) {
+  return (disp_device);
+}
+
+/*********************************************************************************************/
+
 void DisplayClear(void) {
   if (renderer) {
     renderer->fillScreen(bg_color);