diff --git a/CHANGES.md b/CHANGES.md
index 9348717fb5..a5b9e43142 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes in Element 1.0.9 (2020-XX-XX)
 ===================================================
 
 Features ✨:
- -
+ - Hide encrypted history (before user is invited). Can be shown if wanted in developer settings
 
 Improvements 🙌:
  - Wording differentiation for direct rooms (#2176)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index abe16e7e90..5e9d8d1ac0 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -286,7 +286,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     }
 
     fun labShowCompleteHistoryInEncryptedRoom(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM, false)
+        return developerMode() && defaultPrefs.getBoolean(SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM, false)
     }
 
     fun labAllowedExtendedLogging(): Boolean {