diff --git a/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateLanguageDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateLanguageDto.cs
index 0a470ff6c..d5c11c15e 100644
--- a/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateLanguageDto.cs
+++ b/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateLanguageDto.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System.Linq;
 using Squidex.Domain.Apps.Entities.Apps.Commands;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Reflection;
@@ -30,7 +31,7 @@ namespace Squidex.Areas.Api.Controllers.Apps.Models
 
         public UpdateLanguage ToCommand(Language language)
         {
-            return SimpleMapper.Map(this, new UpdateLanguage { Language = language });
+            return SimpleMapper.Map(this, new UpdateLanguage { Language = language, Fallback = Fallback?.ToList() });
         }
     }
 }
diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.ts b/src/Squidex/app/features/settings/pages/languages/language.component.ts
index 53d4d228a..8ae46d7ee 100644
--- a/src/Squidex/app/features/settings/pages/languages/language.component.ts
+++ b/src/Squidex/app/features/settings/pages/languages/language.component.ts
@@ -62,7 +62,7 @@ export class LanguageComponent implements OnChanges {
         const value = this.editForm.submit();
 
         if (value) {
-            const request = { ...value, fallbackLanguages: this.fallbackLanguages.map(x => x.iso2Code).values };
+            const request = { ...value, fallback: this.fallbackLanguages.map(x => x.iso2Code).values };
 
             this.languagesState.update(this.language, request)
                 .subscribe(() => {
diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
index a41d8d505..801714dd4 100644
--- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
@@ -61,8 +61,8 @@ export class LanguagesPageComponent extends ResourceOwner implements OnInit {
         }
     }
 
-    public trackByLanguage(language: { language: AppLanguageDto }) {
-        return language.language;
+    public trackByLanguage(index: number, language: { language: AppLanguageDto }) {
+        return language.language.iso2Code;
     }
 }