diff --git a/website/src/components/ReviewPage/ReviewCard.tsx b/website/src/components/ReviewPage/ReviewCard.tsx
index 6c961926ab..98146d4479 100644
--- a/website/src/components/ReviewPage/ReviewCard.tsx
+++ b/website/src/components/ReviewPage/ReviewCard.tsx
@@ -67,7 +67,9 @@ export const ReviewCard: FC<ReviewCardProps> = ({
                         keyName={getAccessionVersionString(sequenceEntryStatus)}
                         value={sequenceEntryStatus.submissionId}
                     />
-                    {data !== undefined && <MetadataList data={data} metadataDisplayNames={metadataDisplayNames} isLoading={isLoading} />}
+                    {data !== undefined && (
+                        <MetadataList data={data} metadataDisplayNames={metadataDisplayNames} isLoading={isLoading} />
+                    )}
                     {sequenceEntryStatus.isRevocation && (
                         <KeyValueComponent
                             accessionVersion={getAccessionVersionString(sequenceEntryStatus)}
@@ -188,7 +190,7 @@ const MetadataList: FC<MetadataListProps> = ({ data, isLoading, metadataDisplayN
             <KeyValueComponent
                 accessionVersion={getAccessionVersionString(data)}
                 key={index}
-                keyName={metadataDisplayNames.get(metadataName) ? metadataDisplayNames.get(metadataName)! : metadataName}
+                keyName={metadataDisplayNames.get(metadataName) ?? metadataName}
                 value={displayMetadataField(value)}
                 warnings={data.warnings?.filter(isAnnotationPresent(metadataName))}
                 errors={data.errors?.filter(isAnnotationPresent(metadataName))}
diff --git a/website/src/config.ts b/website/src/config.ts
index 869f955571..ba7c78f991 100644
--- a/website/src/config.ts
+++ b/website/src/config.ts
@@ -30,13 +30,12 @@ export function getWebsiteName(): string {
 }
 
 export function getMetadataDisplayNames(organism: string): Map<string, string> {
-    const displayNames = new Map<string, string>()
-    getWebsiteConfig().organisms[organism].schema.metadata
-        .forEach(({name, displayName}) => {
-            displayName = displayName ? displayName : name
-            displayNames.set(name, displayName)
-        })
-    return displayNames
+    return new Map(
+        getWebsiteConfig().organisms[organism].schema.metadata.map(({ name, displayName }) => [
+            name,
+            displayName ?? name,
+        ]),
+    );
 }
 
 export type Organism = {