diff --git a/include/mqtt.h b/include/mqtt.h
index c3cf829..b6fd992 100644
--- a/include/mqtt.h
+++ b/include/mqtt.h
@@ -77,6 +77,14 @@ namespace Mqtt {
                 if (String { "PRESS" }.equals(msg)) ESP.restart();
             }
         },
+        new Ha::Button{"Display sensor data", "display_sensor_data",
+            [](const char* msg) {
+                if (String { "PRESS" }.equals(msg) && !Display::tDisplaySensor.isEnabled()) {
+                    Bme::data.readAll();
+                    Display::tDisplaySensor.restart();
+                };
+            }
+        },
         ledMqtt,
         hourFormatMqtt,
         brightnessMqtt
diff --git a/src/esp_clock.cpp b/src/esp_clock.cpp
index e2aa8a5..74f938f 100644
--- a/src/esp_clock.cpp
+++ b/src/esp_clock.cpp
@@ -21,6 +21,7 @@ Task tWifiConnected(TASK_IMMEDIATE, TASK_ONCE, onWifiConnected, &ts);
 #define BUTTON D3
 
 Task tButton(TASK_IMMEDIATE, TASK_ONCE, []() {
+  if (Display::tDisplaySensor.isEnabled()) return;
   Bme::data.readAll();
   Display::tDisplaySensor.restart();
 }, &ts);