diff --git a/windows/src/desktop/setup/Keyman.Setup.System.SetupUILanguageManager.pas b/windows/src/desktop/setup/Keyman.Setup.System.SetupUILanguageManager.pas
index e1ba7de8bf..1625521ff9 100644
--- a/windows/src/desktop/setup/Keyman.Setup.System.SetupUILanguageManager.pas
+++ b/windows/src/desktop/setup/Keyman.Setup.System.SetupUILanguageManager.pas
@@ -168,6 +168,8 @@ begin
                   );
   FreeAndNil(FSortedValues);
   FSortedValues := sortedPairA;
+  FIndexMapping.Clear;
+  
   i := 0;
   FIndexMapping.Clear;
   for item in FLocales do