diff --git a/src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php b/src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php
index 69d12ac60c..9252813f22 100644
--- a/src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php
+++ b/src/lib/Repository/EventSubscriber/NameSchemaSubscriber.php
@@ -117,8 +117,8 @@ private function processEvent(
         ?array $fieldMap = null
     ): array {
         foreach ($languages as $languageCode) {
+            $tokenValues[$languageCode] = [];
             foreach ($identifiers as $identifier) {
-                $tokenValues[$languageCode] = [];
                 $fieldDefinition = $contentType->getFieldDefinition($identifier);
                 if (null === $fieldDefinition) {
                     continue;