diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index 76e41fe4b8..be7df25381 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -46,8 +46,6 @@ export default class ManageEventIndex extends React.Component {
             currentRoom: null,
             eventIndexingEnabled:
                 SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing'),
-            crawlerSleepTime:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
         };
     }
 
@@ -102,20 +100,6 @@ export default class ManageEventIndex extends React.Component {
         });
     }
 
-    _onEventIndexingEnabledChange = (checked) => {
-        SettingsStore.setValue("enableCrawling", null, SettingLevel.DEVICE, checked);
-
-        if (checked) EventIndexPeg.start();
-        else EventIndexPeg.stop();
-
-        this.setState({eventIndexingEnabled: checked});
-    }
-
-    _onCrawlerSleepTimeChange = (e) => {
-        this.setState({crawlerSleepTime: e.target.value});
-        SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
-    }
-
     _onDisable = async () => {
         this.props.onFinished(false);
     }
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index a10f4aff71..6d38f1683f 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -30,6 +30,7 @@ export default class EventIndex {
         // The time in ms that the crawler will wait loop iterations if there
         // have not been any checkpoints to consume in the last iteration.
         this._crawlerIdleTime = 5000;
+        this._crawlerSleepTime = 3000;
         // The maximum number of events our crawler should fetch in a single
         // crawl.
         this._eventsPerCrawl = 100;
@@ -211,7 +212,7 @@ export default class EventIndex {
             // This is a low priority task and we don't want to spam our
             // homeserver with /messages requests so we set a hefty timeout
             // here.
-            let sleepTime = SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime');
+            let sleepTime = this._crawlerSleepTime;
 
             // Don't let the user configure a lower sleep time than 100 ms.
             sleepTime = Math.max(sleepTime, 100);
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 68b26dbae1..44f38f232f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -486,11 +486,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: RIGHT_PANEL_PHASES.GroupMemberList,
     },
-    "crawlerSleepTime": {
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        displayName: _td("How long should the crawler wait between requests"),
-        default: 3000,
-    },
     "enableEventIndexing": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("Enable message search in encrypted rooms"),