diff --git a/src/ifcparse/IfcFile.cpp b/src/ifcparse/IfcFile.cpp
index 1b66f4d9cc..a7da2d7eea 100644
--- a/src/ifcparse/IfcFile.cpp
+++ b/src/ifcparse/IfcFile.cpp
@@ -336,7 +336,7 @@ std::shared_ptr<InstanceData> IfcParse::parse_context::construct(IfcParse::IfcFi
         }
     }
 
-    return std::make_shared<InstanceData>(owner, decl, name.value_or(0), std::move(storage));
+    return std::make_shared<InstanceData>(owner, decl, (decl && decl->as_entity()) ? name.value_or(0) : 0, std::move(storage));
 }
 
 /*