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 d5303c337e..c99ccf34c3 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue
@@ -187,9 +187,13 @@ export default {
         if (entity[attr] == null)
           return
 
-        if (!this.entityGroups[attr][entity[attr]])
-          this.entityGroups[attr][entity[attr]] = {}
-        this.entityGroups[attr][entity[attr]][entity.id] = entity
+        if (attr == 'id')
+          this.entityGroups[attr][entity[attr]] = entity
+        else {
+          if (!this.entityGroups[attr][entity[attr]])
+            this.entityGroups[attr][entity[attr]] = {}
+          this.entityGroups[attr][entity[attr]][entity.id] = entity
+        }
       })
     },