diff --git a/riot.im/nightly/config.json b/riot.im/nightly/config.json
index fbdc4f9..2610a72 100644
--- a/riot.im/nightly/config.json
+++ b/riot.im/nightly/config.json
@@ -23,7 +23,6 @@
         "feature_dm_verification": "labs",
         "feature_cross_signing": "enable",
         "feature_invite_only_padlocks": "enable",
-        "feature_event_indexing": "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 b64dbe3..1c78826 100644
--- a/riot.im/release/config.json
+++ b/riot.im/release/config.json
@@ -24,8 +24,7 @@
         "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
     },
     "features": {
-        "feature_cross_signing": "enable",
-        "feature_event_indexing": "enable"
+        "feature_cross_signing": "enable"
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,