diff --git a/lib/extension/groups.ts b/lib/extension/groups.ts
index c159cfd8d5..3ce8592253 100644
--- a/lib/extension/groups.ts
+++ b/lib/extension/groups.ts
@@ -170,9 +170,7 @@ export default class Groups extends Extension {
                 const stateKey =
                     endpointNames &&
                     endpointNames.length >= member.ID &&
-                    device.definition &&
-                    device.definition.meta &&
-                    device.definition.meta.multiEndpoint &&
+                    device.definition?.meta?.multiEndpoint &&
                     (!device.definition.meta.multiEndpointSkip || !device.definition.meta.multiEndpointSkip.includes('state'))
                         ? `state_${endpointNames[member.ID - 1]}`
                         : 'state';