diff --git a/docs/labs.md b/docs/labs.md
index 970a46d1e..2666cdeff 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -86,14 +86,6 @@ at the moment. If something goes wrong, add this to your config to disable it:
 The setting will be removed in a future release, enabling it non-optionally for
 all users.
 
-## Event indexing and E2EE search support using Seshat (`feature_event_indexing`)
-
-Adds support for search in E2E encrypted rooms. This enables an event indexer
-that downloads, stores, and indexes room messages for E2E encrypted rooms.
-
-The existing search will transparently work for encrypted rooms just like it
-does for non-encrypted.
-
 ## Bridge info tab (`feature_bridge_state`)
 
 Adds a "Bridge Info" tab to the Room Settings dialog, if a compatible bridge is
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index cf193a6cf..be3acfa9d 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -22,7 +22,6 @@
         "feature_dm_verification": "labs",
         "feature_cross_signing": "enable",
         "feature_invite_only_padlocks": "enable",
-        "feature_event_indexing": "disable",
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
         "feature_custom_themes": "labs"