diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Dimmer.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Dimmer.vue
index 678079f5..82b1be80 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Dimmer.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Dimmer.vue
@@ -54,12 +54,6 @@ export default {
   components: {Slider, EntityIcon},
   mixins: [EntityMixin],
 
-  data() {
-    return {
-      collapsed: true,
-    }
-  },
-
   computed: {
     parsedValue() {
       if (this.value?.is_write_only || this.value?.value == null)
diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue
index e5b421bf..cc22f9f8 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue
@@ -46,7 +46,6 @@ export default {
   data() {
     return {
       component: null,
-      collapsed: true,
       justUpdated: false,
     }
   },
@@ -94,7 +93,7 @@ export default {
     toggleCollapsed() {
       this.collapsed = !this.collapsed
       // Propagate the collapsed state to the wrapped component if applicable
-      if ('collapsed' in this.instance)
+      if (this.instance)
         this.instance.collapsed = !this.instance.collapsed
     }
   },
diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue b/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue
index 9c968d82..17ea2940 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue
@@ -35,6 +35,7 @@ export default {
   data() {
     return {
       modalVisible: false,
+      collapsed: true,
     }
   },
 
diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/EnumSwitch.vue b/platypush/backend/http/webapp/src/components/panels/Entities/EnumSwitch.vue
index c354eb77..10e017c8 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/EnumSwitch.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/EnumSwitch.vue
@@ -51,12 +51,6 @@ export default {
   components: {EntityIcon},
   mixins: [EntityMixin],
 
-  data() {
-    return {
-      collapsed: true,
-    }
-  },
-
   computed: {
     hasValues() {
       return !!Object.values(this?.value?.values || {}).length
diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Light.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Light.vue
index 99859542..2f06b586 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Light.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Light.vue
@@ -78,7 +78,6 @@ export default {
 
   data() {
     return {
-      collapsed: true,
       colorConverter: null,
     }
   },