diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f1f4f4dc7ca..0d3509b4093 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2431,7 +2431,7 @@
             "history_visibility_joined": "Members only (since they joined)",
             "history_visibility_legend": "Who can read history?",
             "history_visibility_shared": "Members only (since the point in time of selecting this option)",
-            "history_visibility_warning": "The visibility of existing history will not be changed.",
+            "history_visibility_warning": "The visibility of existing history will not be changed. Note: these settings currently do not work in encrypted rooms.",
             "history_visibility_world_readable": "Anyone",
             "join_rule_description": "Decide who can join %(roomName)s.",
             "join_rule_invite": "Private (invite only)",
diff --git a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
index 920ef3c0bf6..6b1dec40abc 100644
--- a/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
@@ -15,7 +15,7 @@ exports[`<SecurityRoomSettingsTab /> history visibility uses shared as default h
     <div
       class="mx_SettingsSubsection_text"
     >
-      The visibility of existing history will not be changed.
+      The visibility of existing history will not be changed. Note: these settings currently do not work in encrypted rooms.
     </div>
   </div>
   <div