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 cb997863a..893086fcb 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue
@@ -24,11 +24,12 @@
       </div>
     </div>
 
-    <div class="children fade-in" v-if="!isCollapsed">
+    <div class="children fade-in" v-if="hasChildren && !isCollapsed">
       <div class="child" v-for="entity in computedChildren" :key="entity.id">
         <Entity
          :value="entity"
          :parent="value"
+         :children="childrenByParentId(entity.id)"
          :loading="loading"
          :level="level + 1"
          @show-modal="$emit('show-modal', $event)"
@@ -88,6 +89,19 @@ export default {
       return this.objectsEqual(a, b)
     },
 
+    childrenByParentId(parentId) {
+      return Object.values(this.allEntities || {}).
+        filter(
+          (entity) => entity
+            && entity.parent_id === parentId
+            && !entity.is_configuration
+        ).
+        reduce((obj, entity) => {
+          obj[entity.id] = entity
+          return obj
+        }, {})
+    },
+
     onClick(event) {
       event.stopPropagation()
 
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 337da2ae7..a00cd69ca 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue
@@ -31,6 +31,11 @@ export default {
       default: () => {},
     },
 
+    allEntities: {
+      type: Object,
+      default: () => {},
+    },
+
     level: {
       type: Number,
       default: 0,
diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue
index ed1ccf58d..699242e2c 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue
@@ -57,6 +57,7 @@
                 <Entity
                   :value="entity"
                   :children="childrenByParentId(entity.id)"
+                  :all-entities="entities"
                   @show-modal="onEntityModal($event)"
                   @input="onEntityInput(entity)"
                   :error="!!errorEntities[entity.id]"