diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
index 4b415a1a98d3aca19ee2ff13425de8f492753d65..a866801084bd0fc231e7256e22e2dfc4942d6104 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
@@ -276,6 +276,8 @@ class SimpleSAML_Metadata_MetaDataStorageHandler {
 		foreach($this->sources as $source) {
 			$metadata = $source->getMetaData($index, $set);
 			if($metadata !== NULL) {
+				$metadata['metadata-index'] = $index;
+				$metadata['metadata-set'] = $set;
 				return $metadata;
 			}
 		}