diff --git a/fineract-command/src/main/java/org/apache/fineract/command/starter/CommandConfiguration.java b/fineract-command/src/main/java/org/apache/fineract/command/starter/CommandConfiguration.java
index b2de1a6bc..f16969b20 100644
--- a/fineract-command/src/main/java/org/apache/fineract/command/starter/CommandConfiguration.java
+++ b/fineract-command/src/main/java/org/apache/fineract/command/starter/CommandConfiguration.java
@@ -29,6 +29,7 @@ import org.apache.fineract.command.core.CommandProperties;
 import org.apache.fineract.command.core.CommandRouter;
 import org.apache.fineract.command.implementation.DisruptorCommandExecutor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -42,11 +43,13 @@ class CommandConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
+    @ConditionalOnProperty(value = "fineract.command.executor", havingValue = "disruptor")
     WaitStrategy waitStrategy() {
         return new YieldingWaitStrategy();
     }
 
     @Bean
+    @ConditionalOnProperty(value = "fineract.command.executor", havingValue = "disruptor")
     Disruptor<?> disruptor(CommandProperties properties, WaitStrategy waitStrategy, List<CommandMiddleware> middlewares,
             CommandRouter router) {
         // TODO: make this more configurable