diff --git a/de_web_plugin.cpp b/de_web_plugin.cpp
index 794ee6969d..2743f0e429 100644
--- a/de_web_plugin.cpp
+++ b/de_web_plugin.cpp
@@ -3514,7 +3514,6 @@ void DeRestPluginPrivate::checkSensorButtonEvent(Sensor *sensor, const deCONZ::A
                 gids = QStringList();
                 gids << "0" << "0" << "0" << "0";
             }
-            else 
 
             // check group corresponding to source endpoint
             int i = ind.srcEndpoint();
@@ -15180,10 +15179,12 @@ void DeRestPluginPrivate::delayedFastEnddeviceProbe(const deCONZ::NodeEvent *eve
             checkSensorBindingsForClientClusters(sensor);
         }
         else if (sensor->modelId().startsWith(QLatin1String("ICZB-RM")) || // icasa remote
-                 sensor->modelId().startsWith(QLatin1String("ZGRC-KEY"))   // Sunricher remote
+                 sensor->modelId().startsWith(QLatin1String("ZGRC-KEY")))  // Sunricher remote
         {
-            if (sensor->modelId() == QLatin1String("ZGRC-KEY-012")) { quint8 lastEndpoint = 0x05; }
-            else { quint8 lastEndpoint = 0x04; }
+            quint8 lastEndpoint;
+            
+            if (sensor->modelId() == QLatin1String("ZGRC-KEY-012")) { lastEndpoint = 0x05; }
+            else { lastEndpoint = 0x04; }
             
             ResourceItem *item = sensor->item(RConfigGroup);
             if (!item)
diff --git a/sensor.h b/sensor.h
index 17f1f71e14..0f7222c363 100644
--- a/sensor.h
+++ b/sensor.h
@@ -50,6 +50,9 @@
 #define S_BUTTON_7   7000
 #define S_BUTTON_8   8000
 #define S_BUTTON_9   9000
+#define S_BUTTON_10  10000
+#define S_BUTTON_11  11000
+#define S_BUTTON_12  12000
 
 struct SensorFingerprint
 {