diff --git a/spark3/src/main/scala/org/apache/spark/sql/catalyst/utils/PlanUtils.scala b/spark3/src/main/scala/org/apache/spark/sql/catalyst/utils/PlanUtils.scala
index e6cdf8971e83..29022230b8b6 100644
--- a/spark3/src/main/scala/org/apache/spark/sql/catalyst/utils/PlanUtils.scala
+++ b/spark3/src/main/scala/org/apache/spark/sql/catalyst/utils/PlanUtils.scala
@@ -61,7 +61,8 @@ object PlanUtils {
     if (Spark3VersionUtil.isSpark30) {
       repartitionByExpressionCtor.newInstance(partitionExpressions, child, Integer.valueOf(numPartitions))
     } else {
-      repartitionByExpressionCtor.newInstance(partitionExpressions, child, Some(numPartitions))
+      // Do not pass numPartitions because it is set automatically for AQE
+      repartitionByExpressionCtor.newInstance(partitionExpressions, child, None)
     }
   }
 }