diff --git a/src/service/search/datafusion/optimizer/mod.rs b/src/service/search/datafusion/optimizer/mod.rs
index 867bf0c3b2..fc3290c3cb 100644
--- a/src/service/search/datafusion/optimizer/mod.rs
+++ b/src/service/search/datafusion/optimizer/mod.rs
@@ -132,15 +132,6 @@ pub fn generate_optimizer_rules(sql: &Sql) -> Vec<Arc<dyn OptimizerRule + Send +
     rules.push(Arc::new(RewriteCipherCall::new()));
     #[cfg(feature = "enterprise")]
     rules.push(Arc::new(RewriteCipherKey::new(&sql.org_id)));
-
-    // should after ExtractEquijoinPredicate, because LimitJoinRightSide will
-    // require the join's on columns
-    if cfg.common.feature_join_match_one_enabled && cfg.common.feature_join_right_side_max_rows > 0
-    {
-        rules.push(Arc::new(LimitJoinRightSide::new(
-            cfg.common.feature_join_right_side_max_rows,
-        )));
-    }
     // ************************************
 
     // Filters can't be pushed down past Limits, we should do PushDownFilter after
@@ -156,5 +147,16 @@ pub fn generate_optimizer_rules(sql: &Sql) -> Vec<Arc<dyn OptimizerRule + Send +
     rules.push(Arc::new(EliminateGroupByConstant::new()));
     rules.push(Arc::new(OptimizeProjections::new()));
 
+    // *********** custom rules ***********
+    // should after ExtractEquijoinPredicate and PushDownFilter, because LimitJoinRightSide will
+    // require the join's on columns, and if filter have join keys, it should be pushed down
+    if cfg.common.feature_join_match_one_enabled && cfg.common.feature_join_right_side_max_rows > 0
+    {
+        rules.push(Arc::new(LimitJoinRightSide::new(
+            cfg.common.feature_join_right_side_max_rows,
+        )));
+    }
+    // ************************************
+
     rules
 }