diff --git a/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php b/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
index bfd4b1a6d3c0ed4fde7a8ac1895b5637ac1a9730..4da9eda83dc72035b0b8b2ca146b3b5d187c3818 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
@@ -182,7 +182,8 @@ class MetaDataStorageHandlerPdo extends MetaDataStorageSource
             }
 
             // update the entity id to either the key (if not dynamic or generate the dynamic hosted url)
-            $metadataSet[$d['entity_id']] = $this->updateEntityID($set, $entityId, $data);
+            $data['entityid'] = $entityId;
+            $metadataSet[$d['entity_id']] = $data;
         }
 
         $indexLookup = $this->lookupIndexFromEntityId($entityId, $metadataSet);