diff --git a/src/Somfy.cpp b/src/Somfy.cpp
index 3d91e37..9e09ef2 100644
--- a/src/Somfy.cpp
+++ b/src/Somfy.cpp
@@ -1565,8 +1565,10 @@ void SomfyGroup::emitState(uint8_t num, const char *evt) {
   for(uint8_t i = 0; i < SOMFY_MAX_GROUPED_SHADES; i++) {
     if(this->linkedShades[i] != 255 && this->linkedShades[i] != 0) {
       SomfyShade *shade = somfy.getShadeById(this->linkedShades[i]);
-      if(shade) json->addElem(this->linkedShades[i]);
-      flags |= shade->flags;
+      if(shade) {
+        json->addElem(this->linkedShades[i]);
+        flags |= shade->flags;
+      }
     }
   }
   json->endArray();