diff --git a/src/headless/plugins/disco/entity.js b/src/headless/plugins/disco/entity.js
index c615aef49..8cd5594b5 100644
--- a/src/headless/plugins/disco/entity.js
+++ b/src/headless/plugins/disco/entity.js
@@ -142,11 +142,9 @@ const DiscoEntity = Model.extend({
             }
             const jid = item.getAttribute('jid');
             if (this.items.get(jid) === undefined) {
-                const name = item.getAttribute('name');
                 const entities = _converse.disco_entities;
-                if (!entities.get(jid))
-                    entities.create({ jid, name });
-                this.items.create({ jid, name });
+                const entity = entities.get(jid) || entities.create({ jid, name: item.getAttribute('name') });
+                this.items.create(entity);
             }
         });
     },