diff --git a/CHANGES.md b/CHANGES.md
index 50e8a8e94a..3b94ab0390 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Other changes:
- -
+ - Markdown set to off by default (#412)
 
 Bugfix 🐛:
  - Passphrase does not match (Export room keys) (#644)
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
index f9601265d3..a593bb6e96 100755
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
@@ -576,7 +576,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
      * @return true if the markdown is enabled
      */
     fun isMarkdownEnabled(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_ENABLE_MARKDOWN_KEY, true)
+        return defaultPrefs.getBoolean(SETTINGS_ENABLE_MARKDOWN_KEY, false)
     }
 
     /**
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 11209b5345..96471cfebe 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -39,7 +39,7 @@
             android:title="@string/settings_send_typing_notifs" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
-            android:defaultValue="true"
+            android:defaultValue="false"
             android:key="SETTINGS_ENABLE_MARKDOWN_KEY"
             android:summary="@string/settings_send_markdown_summary"
             android:title="@string/settings_send_markdown" />