diff --git a/Oqtane.Server/Repository/LanguageRepository.cs b/Oqtane.Server/Repository/LanguageRepository.cs
index 0ee5105b..7f92086b 100644
--- a/Oqtane.Server/Repository/LanguageRepository.cs
+++ b/Oqtane.Server/Repository/LanguageRepository.cs
@@ -20,7 +20,10 @@ namespace Oqtane.Repository
             if (language.IsDefault)
             {
                 // Ensure all other languages are not set to current
-                _db.Language.ToList().ForEach(l => l.IsDefault = false);
+                _db.Language
+                    .Where(l => l.SiteId == language.SiteId)
+                    .ToList()
+                    .ForEach(l => l.IsDefault = false);
             }
 
             _db.Language.Add(language);