diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs
index c1fa2ea16..2e270a20b 100644
--- a/Flow.Launcher.Core/Resource/Internationalization.cs
+++ b/Flow.Launcher.Core/Resource/Internationalization.cs
@@ -14,7 +14,7 @@ using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core.Resource
 {
-    public class Internationalization
+    public class Internationalization : IDisposable
     {
         private static readonly string ClassName = nameof(Internationalization);
 
@@ -379,5 +379,15 @@ namespace Flow.Launcher.Core.Resource
         }
 
         #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            RemoveOldLanguageFiles();
+            _langChangeLock.Dispose();
+        }
+
+        #endregion
     }
 }
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 0360c761e..8ec11e5ff 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -45,6 +45,7 @@ namespace Flow.Launcher
         private static Settings _settings;
         private static MainWindow _mainWindow;
         private readonly MainViewModel _mainVM;
+        private readonly Internationalization _internationalization;
 
         // To prevent two disposals running at the same time.
         private static readonly object _disposingLock = new();
@@ -107,6 +108,7 @@ namespace Flow.Launcher
                 API = Ioc.Default.GetRequiredService<IPublicAPI>();
                 _settings.Initialize();
                 _mainVM = Ioc.Default.GetRequiredService<MainViewModel>();
+                _internationalization = Ioc.Default.GetRequiredService<Internationalization>();
             }
             catch (Exception e)
             {
@@ -193,7 +195,7 @@ namespace Flow.Launcher
                 Win32Helper.EnableWin32DarkMode(_settings.ColorScheme);
 
                 // Initialize language before portable clean up since it needs translations
-                await Ioc.Default.GetRequiredService<Internationalization>().InitializeLanguageAsync();
+                await _internationalization.InitializeLanguageAsync();
 
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
@@ -421,6 +423,7 @@ namespace Flow.Launcher
                     _mainWindow?.Dispatcher.Invoke(_mainWindow.Dispose);
                     _mainVM?.Dispose();
                     DialogJump.Dispose();
+                    _internationalization.Dispose();
                 }
 
                 API.LogInfo(ClassName, "End Flow Launcher dispose ----------------------------------------------------");