diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 2c8fb8fb9d..287bf35be0 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -1107,7 +1107,11 @@ private static function processExtensions($element, $parentExtensions = [])
                                 $values[] = $attrval->getString();
                             }
 
-                            $ret['EntityAttributes'][$name] = $values;
+                            if (empty($ret['EntityAttributes'][$name])) {
+                                $ret['EntityAttributes'][$name] = $values;
+                            } else {
+                                $ret['EntityAttributes'][$name] = array_merge($ret['EntityAttributes'][$name], $values);
+                            }
                         }
                     }
                 }