diff --git a/conf/broker.conf b/conf/broker.conf
index 7f07ae5444993..daeb9193fac8e 100644
--- a/conf/broker.conf
+++ b/conf/broker.conf
@@ -407,7 +407,7 @@ dispatchThrottlingOnNonBacklogConsumerEnabled=true
 dispatcherMaxReadBatchSize=100
 
 # Dispatch messages and execute broker side filters in a per-subscription thread
-dispatcherDispatchMessagesInSubscriptionThread=true
+dispatcherDispatchMessagesInSubscriptionThread=false
 
 # Max size in bytes of entries to read from bookkeeper. By default it is 5MB.
 dispatcherMaxReadSizeBytes=5242880
@@ -1572,4 +1572,4 @@ managedLedgerMaxUnackedRangesToPersistInZooKeeper=-1
 
 # If enabled, the maximum "acknowledgment holes" will not be limited and "acknowledgment holes" are stored in
 # multiple entries.
-persistentUnackedRangesWithMultipleEntriesEnabled=false
\ No newline at end of file
+persistentUnackedRangesWithMultipleEntriesEnabled=false
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index 2dfa122d83dcf..92bc633a38473 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -995,7 +995,7 @@ public class ServiceConfiguration implements PulsarConfiguration {
             category = CATEGORY_SERVER,
             doc = "Dispatch messages and execute broker side filters in a per-subscription thread"
     )
-    private boolean dispatcherDispatchMessagesInSubscriptionThread = true;
+    private boolean dispatcherDispatchMessagesInSubscriptionThread = false;
 
     // <-- dispatcher read settings -->
     @FieldContext(