diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a291065145..be8f1a7a4a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -399,7 +399,7 @@
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Support adding custom themes": "Support adding custom themes",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Enable cross-signing to verify per-user instead of per-session (in development)",
+    "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 232c5d9f66..32ff0a5f94 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -152,9 +152,10 @@ export const SETTINGS = {
         default: null,
     },
     "feature_cross_signing": {
-        //isFeature: true,
-        displayName: _td("Enable cross-signing to verify per-user instead of per-session (in development)"),
-        supportedLevels: LEVELS_FEATURE,
+        // XXX: We shouldn't be using the feature prefix for non-feature settings. There is an exception
+        // for this case though as we're converting a feature to a setting for a temporary safety net.
+        displayName: _td("Enable cross-signing to verify per-user instead of per-session"),
+        supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here.
         default: true,
     },
     "feature_event_indexing": {