diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift
index bc8b64683..2bb5cd468 100644
--- a/Config/BWIBuildSettings.swift
+++ b/Config/BWIBuildSettings.swift
@@ -672,7 +672,7 @@ class BWIBuildSettings: NSObject {
     var enableFeatureVoiceBroadcastsByDefault = false
     
     // MARK: WYSIWYG
-    var enableFeatureWYSIWYGByDefault = true
+    var enableFeatureWYSIWYGByDefault = false
     var bwiWYSIWYGVisibilityInSettings = true 
     var enableWYSIWYGCommands = false
     
diff --git a/Config/BuM-BWI-MDM/BWIBuildSettings+BuM-BWI-MDM.swift b/Config/BuM-BWI-MDM/BWIBuildSettings+BuM-BWI-MDM.swift
index 1d681ca54..cc885ba20 100644
--- a/Config/BuM-BWI-MDM/BWIBuildSettings+BuM-BWI-MDM.swift
+++ b/Config/BuM-BWI-MDM/BWIBuildSettings+BuM-BWI-MDM.swift
@@ -30,6 +30,7 @@ extension BWIBuildSettings {
         bwiUseWellKnownPrivacyPolicyLink = true
         itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
     
 }
diff --git a/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift b/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift
index 37ae265d6..53dc7c8e4 100644
--- a/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift
+++ b/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift
@@ -41,5 +41,6 @@ extension BWIBuildSettings {
 
         itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
 }
diff --git a/Config/BuM-Open/BWIBuildSettings+BuM-Open.swift b/Config/BuM-Open/BWIBuildSettings+BuM-Open.swift
index dd4f13883..9d0f884d7 100644
--- a/Config/BuM-Open/BWIBuildSettings+BuM-Open.swift
+++ b/Config/BuM-Open/BWIBuildSettings+BuM-Open.swift
@@ -32,6 +32,7 @@ extension BWIBuildSettings {
         
         itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger-open/id6450672686"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
     
 }
diff --git a/Config/BuM/BWIBuildSettings+BuM.swift b/Config/BuM/BWIBuildSettings+BuM.swift
index 8b773a8ec..96afec0aa 100644
--- a/Config/BuM/BWIBuildSettings+BuM.swift
+++ b/Config/BuM/BWIBuildSettings+BuM.swift
@@ -30,6 +30,7 @@ extension BWIBuildSettings {
         bwiUseWellKnownPrivacyPolicyLink = true
         itunesAppLink = "https://apps.apple.com/de/app/bundesmessenger/id1616866351"
         avoidServerSelectionOnAppConfig = true
+        enableFeatureWYSIWYGByDefault = true
     }
     
 }