diff --git a/indexer.js b/indexer.js
index 5bc08d63..b90ace53 100644
--- a/indexer.js
+++ b/indexer.js
@@ -104,7 +104,9 @@ class Indexer {
         }
 
         if (payload) {
-            let hasFeatureFlag = await db.redis.sismember(`feature:indexing`, entry.user.toString());
+            let hasFeatureFlag =
+                (config.enabledFeatureFlags && config.enabledFeatureFlags.indexer) || (await db.redis.sismember(`feature:indexing`, entry.user.toString()));
+
             if (!hasFeatureFlag) {
                 log.silly('Indexer', `Feature flag not set, skipping user=%s command=%s message=%s`, entry.user, entry.command, entry.message);
                 return;
diff --git a/package.json b/package.json
index 0bfe88ab..b075da45 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "wildduck",
-    "version": "1.39.1",
+    "version": "1.39.2",
     "description": "IMAP/POP3 server built with Node.js and MongoDB",
     "main": "server.js",
     "scripts": {