diff --git a/src/backend/distributed/operations/auto_shard_split.c b/src/backend/distributed/operations/auto_shard_split.c
index c92f4a958..fd81f20cc 100644
--- a/src/backend/distributed/operations/auto_shard_split.c
+++ b/src/backend/distributed/operations/auto_shard_split.c
@@ -1,21 +1,21 @@
 #include "postgres.h"
 #include "libpq-fe.h"
 #include "executor/spi.h"
-#include "distributed/lock_graph.h"
+// #include "distributed/lock_graph.h"
 #include "distributed/coordinator_protocol.h"
-#include "distributed/metadata_cache.h"
-#include "distributed/metadata_utility.h"
-#include "distributed/multi_logical_replication.h"
-#include "distributed/multi_server_executor.h"
-#include "distributed/pg_dist_rebalance_strategy.h"
-#include "distributed/pg_dist_shard.h"
-#include "distributed/reference_table_utils.h"
-#include "distributed/remote_commands.h"
-#include "distributed/resource_lock.h"
-#include "distributed/tuplestore.h"
-#include "distributed/utils/array_type.h"
-#include "distributed/worker_protocol.h"
-#include "nodes/pg_list.h"
+// #include "distributed/metadata_cache.h"
+// #include "distributed/metadata_utility.h"
+// #include "distributed/multi_logical_replication.h"
+// #include "distributed/multi_server_executor.h"
+// #include "distributed/pg_dist_rebalance_strategy.h"
+// #include "distributed/pg_dist_shard.h"
+// #include "distributed/reference_table_utils.h"
+// #include "distributed/remote_commands.h"
+// #include "distributed/resource_lock.h"
+// #include "distributed/tuplestore.h"
+// #include "distributed/utils/array_type.h"
+// #include "distributed/worker_protocol.h"
+// #include "nodes/pg_list.h"
 #include "postmaster/postmaster.h"
 #include "distributed/distribution_column.h"
 #include "utils/builtins.h"
@@ -110,7 +110,6 @@ ExecuteSplitBackgroundJob(int64 jobid, ShardInfo shardinfo, List *SplitPoints)
 	int32 nodesInvolved[1];
 	nodesInvolved[0] = shardinfo->nodeid;
 	Oid superUserId = CitusExtensionOwner();
-	ErrorOnConcurrentOperation();
 	BackgroundTask *task = ScheduleBackgroundTask(jobid, superUserId, splitQuery->data, 0,
 												  NULL, 1, nodesInvolved);
 }
@@ -255,6 +254,7 @@ ScheduleShardSplit(ShardInfo shardinfo)
 	List *SplitPoints = FindShardSplitPoints(shardinfo);
 	if (list_length(SplitPoints) > 0)
 	{
+		ErrorOnConcurrentOperation();
 		int64 jobId = CreateBackgroundJob("Automatic Shard Split",
 										  "Split using SplitPoints List");
 		ExecuteSplitBackgroundJob(jobId, shardinfo, SplitPoints);
@@ -290,7 +290,7 @@ citus_auto_shard_split_start(PG_FUNCTION_ARGS)
 		" FROM citus_shards cs JOIN pg_dist_shard ps USING(shardid)"
 		" WINDOW w AS (PARTITION BY colocation_id, shardminvalue ORDER BY shard_size DESC) )as t where total_sum >= %ld )"
 		" AS max_sizes ON cs.shardid=max_sizes.shardid AND cs.shard_size = max_sizes.max_size JOIN citus_tables ct ON cs.table_name = ct.table_name AND pd.shardminvalue <> pd.shardmaxvalue AND pd.shardminvalue <> ''",
-		MaxShardSize
+		0
 		);
 
 	ereport(LOG, errmsg("%s", query->data));