diff --git a/riot.im/nightly/config.json b/riot.im/nightly/config.json
index 776fc25..eca0371 100644
--- a/riot.im/nightly/config.json
+++ b/riot.im/nightly/config.json
@@ -21,7 +21,6 @@
         "feature_many_integration_managers": "labs",
         "feature_mjolnir": "labs",
         "feature_dm_verification": "labs",
-        "feature_cross_signing": "enable",
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
         "feature_custom_themes": "labs"
diff --git a/riot.im/release/config.json b/riot.im/release/config.json
index 1c78826..9342151 100644
--- a/riot.im/release/config.json
+++ b/riot.im/release/config.json
@@ -23,9 +23,6 @@
         "siteId": 1,
         "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
     },
-    "features": {
-        "feature_cross_signing": "enable"
-    },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false