diff --git a/zigbee-lumi/integrationpluginzigbeelumi.cpp b/zigbee-lumi/integrationpluginzigbeelumi.cpp
index af152394..90ae8a13 100644
--- a/zigbee-lumi/integrationpluginzigbeelumi.cpp
+++ b/zigbee-lumi/integrationpluginzigbeelumi.cpp
@@ -402,6 +402,21 @@ void IntegrationPluginZigbeeLumi::setupThing(ThingSetupInfo *info)
         });
     }
 
+    if (thing->thingClassId() == lumiButtonSensorThingClassId) {
+        ZigbeeClusterOnOff *onOffCluster = endpoint->inputCluster<ZigbeeClusterOnOff>(ZigbeeClusterLibrary::ClusterIdOnOff);
+        if (onOffCluster) {
+            connect(onOffCluster, &ZigbeeClusterOnOff::powerChanged, thing, [this, thing](bool power){
+                qCDebug(dcZigbeeLumi()) << thing << "state changed" << (power ? "closed" : "open");
+                if (!power) {
+                    emitEvent(Event(lumiButtonSensorPressedEventTypeId, thing->id()));
+                }
+            });
+        } else {
+            qCWarning(dcZigbeeLumi()) << "Could not find the OnOff input cluster on" << thing << endpoint;
+        }
+    }
+
+
 
     info->finish(Thing::ThingErrorNoError);