diff --git a/UI/BigComponents/HiddenThemeList.svelte b/UI/BigComponents/HiddenThemeList.svelte
index a33f9fb639..88db67e8fe 100644
--- a/UI/BigComponents/HiddenThemeList.svelte
+++ b/UI/BigComponents/HiddenThemeList.svelte
@@ -27,7 +27,14 @@
   $: knownThemes = hiddenThemes.filter((theme) => knownThemesId.includes(theme.id))
 </script>
 
-<ThemesList {search} {state} {onMainScreen} themes={knownThemes} isCustom={false} hideThemes={false}>
+<ThemesList
+  {search}
+  {state}
+  {onMainScreen}
+  themes={knownThemes}
+  isCustom={false}
+  hideThemes={false}
+>
   <svelte:fragment slot="title">
     <h3>{t.previouslyHiddenTitle.toString()}</h3>
     <p>
diff --git a/UI/BigComponents/ThemesList.svelte b/UI/BigComponents/ThemesList.svelte
index fa448a8e87..3f4bc51a58 100644
--- a/UI/BigComponents/ThemesList.svelte
+++ b/UI/BigComponents/ThemesList.svelte
@@ -49,7 +49,7 @@
         <ProfessionalServicesButton />
       {/if}
 
-      {#each filteredThemes as theme}
+      {#each filteredThemes as theme (theme.id)}
         {#if theme !== undefined && !(hideThemes && theme?.hideFromOverview)}
           <ThemeButton {theme} {isCustom} userDetails={state.osmConnection.userDetails} {state} />
         {/if}
@@ -62,7 +62,7 @@
         <ProfessionalServicesButton />
       {/if}
 
-      {#each filteredThemes as theme}
+      {#each filteredThemes as theme (theme.id)}
         {#if theme !== undefined && !(hideThemes && theme?.hideFromOverview)}
           <ThemeButton {theme} {isCustom} userDetails={state.osmConnection.userDetails} {state} />
         {/if}