diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
index 73cd2d6e37..c5d7164d5a 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -400,7 +400,7 @@ class SWDefinition @Inject constructor(
 
     private fun swDefinitionFull() { // List all the screens here
         add(screenSetupWizard)
-            .add(screenLanguage)
+            //.add(screenLanguage)
             .add(screenEula)
             .add(if (isRunningTest()) null else screenPermissionBattery) // cannot mock ask battery optimization
             .add(screenPermissionBt)
@@ -428,7 +428,7 @@ class SWDefinition @Inject constructor(
 
     private fun swDefinitionPumpControl() { // List all the screens here
         add(screenSetupWizard)
-            .add(screenLanguage)
+            //.add(screenLanguage)
             .add(screenEula)
             .add(if (isRunningTest()) null else screenPermissionBattery) // cannot mock ask battery optimization
             .add(screenPermissionBt)
@@ -452,7 +452,7 @@ class SWDefinition @Inject constructor(
 
     private fun swDefinitionNSClient() { // List all the screens here
         add(screenSetupWizard)
-            .add(screenLanguage)
+            //.add(screenLanguage)
             .add(screenEula)
             .add(if (isRunningTest()) null else screenPermissionBattery) // cannot mock ask battery optimization
             .add(screenPermissionStore)