diff --git a/src/core/js/ext_revisions.js b/src/core/js/ext_revisions.js
index 2119a47045d20bea55ff0d65832c2cccd8751ae0..cf0da0c78a83b87c38ecfdce9e3d576328e2b04c 100644
--- a/src/core/js/ext_revisions.js
+++ b/src/core/js/ext_revisions.js
@@ -161,11 +161,14 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
         for (let result of (await results)) {
             if (result.length !== 1) {
                 throw new Error("Invalid datamodel");
-            } else if (getEntityName(result[0]).toLowerCase() === _datamodel.revisionOf.toLowerCase()) {
+            }
+
+            var name = getEntityName(result[0]);
+            if (name && name.toLowerCase() === _datamodel.revisionOf.toLowerCase()) {
                 _datamodel._revisionOfId = getEntityID(result[0]);
-                _datamodel.revisionOf = getEntityName(result[0]);
-            } else if (getEntityName(result[0]).toLowerCase() === _datamodel.obsolete.toLowerCase()) {
-                _datamodel.obsolete = getEntityName(result[0]);
+                _datamodel.revisionOf = name;
+            } else if (name && name.toLowerCase() === _datamodel.obsolete.toLowerCase()) {
+                _datamodel.obsolete = name;
             }
         }
     };
diff --git a/test/core/js/modules/ext_revisions.js.js b/test/core/js/modules/ext_revisions.js.js
index 7b867aca1b7ad73bb836b7e0626b2b7b6a8b1b6b..bd9787afec3039984e3b067638c9ae6a9a3fd422 100644
--- a/test/core/js/modules/ext_revisions.js.js
+++ b/test/core/js/modules/ext_revisions.js.js
@@ -92,7 +92,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
         var query_fun = async function(query) {
             assert.ok(query.startsWith("FIND") && ( query.endsWith(datamodel.obsolete) || query.endsWith(datamodel.revisionOf)), query);
             done_query(); // called twice
-            return [$(`<div name="${datamodel.revisionOf}" data-caosdb-id="3456"/>`)[0]];
+            return [$(`<div data-entity-name="${datamodel.revisionOf}" data-caosdb-id="3456"/>`)[0]];
         }
 
         // injecting the server mock-up responses.