1 files changed, 5 insertions, 0 deletions
diff --git a/src/mongo/db/s/collection_sharding_state_factory_shard.cpp b/src/mongo/db/s/collection_sharding_state_factory_shard.cpp
index 8a1b65fa270..74939c03ffe 100644
--- a/src/mongo/db/s/collection_sharding_state_factory_shard.cpp
+++ b/src/mongo/db/s/collection_sharding_state_factory_shard.cpp
@@ -36,6 +36,7 @@
 #include "mongo/executor/network_interface_factory.h"
 #include "mongo/executor/network_interface_thread_pool.h"
 #include "mongo/executor/thread_pool_task_executor.h"
+#include "mongo/s/sharding_feature_flags_gen.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding
 
@@ -64,6 +65,10 @@ std::unique_ptr<CollectionShardingState> CollectionShardingStateFactoryShard::ma
 
 std::shared_ptr<executor::TaskExecutor>
 CollectionShardingStateFactoryShard::_getRangeDeletionExecutor() {
+    if (feature_flags::gRangeDeleterService.isEnabledAndIgnoreFCV()) {
+        return nullptr;
+    }
+
     stdx::lock_guard<Latch> lg(_mutex);
     if (!_rangeDeletionExecutor) {
         const std::string kExecName("CollectionRangeDeleter-TaskExecutor");