diff --git a/Oqtane.Server/Repository/LanguageRepository.cs b/Oqtane.Server/Repository/LanguageRepository.cs
index bdfd1b3e..ade74f2d 100644
--- a/Oqtane.Server/Repository/LanguageRepository.cs
+++ b/Oqtane.Server/Repository/LanguageRepository.cs
@@ -17,6 +17,12 @@ namespace Oqtane.Repository
 
         public Language AddLanguage(Language language)
         {
+            if (language.IsCurrent)
+            {
+                // Ensure all other languages are not set to current
+                _db.Language.ToList().ForEach(l => l.IsCurrent = false);
+            }
+
             _db.Language.Add(language);
             _db.SaveChanges();