diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h
index 2e19aa8f1e..cc6446d344 100644
--- a/src/App/ComplexGeoData.h
+++ b/src/App/ComplexGeoData.h
@@ -280,7 +280,7 @@ public:
         return _elementMap->setElementName(element, name, masterTag, sid, overwrite);
     }
 
-    bool hasElementMap()
+    bool hasElementMap() const
     {
         return _elementMap != nullptr;
     }
diff --git a/src/App/PropertyGeo.cpp b/src/App/PropertyGeo.cpp
index bfe6dfbbdf..b8f5989deb 100644
--- a/src/App/PropertyGeo.cpp
+++ b/src/App/PropertyGeo.cpp
@@ -1302,7 +1302,7 @@ std::string PropertyComplexGeoData::getElementMapVersion(bool) const
     }
     auto owner = freecad_cast<DocumentObject*>(getContainer());
     std::ostringstream ss;
-    if (owner && owner->getDocument() && owner->getDocument()->getStringHasher() == data->Hasher) {
+    if (owner && owner->getDocument() && data->hasElementMap() && data->getElementMapSize() && owner->getDocument()->getStringHasher() == data->Hasher) {
         ss << "1.";
     }
     else {