diff --git a/api/lib/Gateway.ts b/api/lib/Gateway.ts
index 0d9cc32953..453c0006e0 100644
--- a/api/lib/Gateway.ts
+++ b/api/lib/Gateway.ts
@@ -1319,9 +1319,7 @@ export default class Gateway {
 					} else return
 					break
 				case CommandClasses['Central Scene']:
-					if (!valueId.readable || valueId.writeable) {
-						return
-					}
+				case CommandClasses['Scene Activation']:
 					cfg = utils.copy(hassCfg.central_scene)
 
 					// Combile unique Object id, by using all possible scenarios
@@ -1330,9 +1328,6 @@ export default class Gateway {
 						valueId.property,
 						valueId.propertyKey,
 					)
-					if (valueId.type === 'number') {
-						cfg.discovery_payload.state_class = 'measurement'
-					}
 					break
 				case CommandClasses['Binary Sensor']: {
 					// https://github.com/zwave-js/node-zwave-js/blob/master/packages/zwave-js/src/lib/commandclass/BinarySensorCC.ts#L41