diff --git a/src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php b/src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
index 02f6690a72b3ac5505dd9bcc2565b03eace24c23..12cab5d06b95fe5f9dda37f96943e91966de56c8 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
@@ -134,11 +134,11 @@ class MetaDataStorageHandlerSerialize extends MetaDataStorageSource
         $extLen = strlen(self::EXTENSION);
 
         $finder = new Finder();
-        $finder->directories()->name(sprintf('/%s/$', self::EXTENSION))->in($this->directory);
+        $finder->files()->name('*' .  self::EXTENSION)->in($this->directory . DIRECTORY_SEPARATOR . $set);
 
         $ret = [];
         foreach ($finder as $file) {
-            $entityId = substr($file->getPathName(), 0, -$extLen);
+            $entityId = substr($file->getFileName(), 0, -$extLen);
             $entityId = rawurldecode($entityId);
 
             $md = $this->getMetaData($entityId, $set);