diff --git a/hetu-datacenter/src/main/java/io/hetu/core/plugin/datacenter/pagesource/DataCenterPageSourceProvider.java b/hetu-datacenter/src/main/java/io/hetu/core/plugin/datacenter/pagesource/DataCenterPageSourceProvider.java
index 7eab6faae..c8476de35 100644
--- a/hetu-datacenter/src/main/java/io/hetu/core/plugin/datacenter/pagesource/DataCenterPageSourceProvider.java
+++ b/hetu-datacenter/src/main/java/io/hetu/core/plugin/datacenter/pagesource/DataCenterPageSourceProvider.java
@@ -50,7 +50,6 @@ public class DataCenterPageSourceProvider
 {
     private static final int STRING_CAPACITY = 16;
     private static final String ENABLE_CROSS_REGION_DYNAMIC_FILTER = "cross_region_dynamic_filter_enabled";
-    private static final String OPTIMIZE_DYNAMIC_FILTER_GENERATION = "optimize_dynamic_filter_generation";
     private static final String EXCHANGE_COMPRESSION = "exchange_compression";
 
     private final DataCenterConfig config;
@@ -129,9 +128,8 @@ public class DataCenterPageSourceProvider
         Map<String, String> properties = new HashMap<>();
 
         // Only set the session if there is any dynamic filter for this page source
-        if (dynamicFilterSupplier != null) {
+        if (dynamicFilterSupplier != null && dynamicFilterSupplier.isPresent()) {
             properties.put(ENABLE_CROSS_REGION_DYNAMIC_FILTER, "true");
-            properties.put(OPTIMIZE_DYNAMIC_FILTER_GENERATION, "false"); // close removeUnsupportedDynamicFilter optimizer
         }
         if (config.isCompressionEnabled()) {
             properties.put(EXCHANGE_COMPRESSION, "true");