diff --git a/src/backend/distributed/operations/shard_rebalancer.c b/src/backend/distributed/operations/shard_rebalancer.c
index b5ec9b7ba..c3eb721e2 100644
--- a/src/backend/distributed/operations/shard_rebalancer.c
+++ b/src/backend/distributed/operations/shard_rebalancer.c
@@ -2353,8 +2353,8 @@ GetSetCommandListForNewConnections(void)
 {
 	List *commandList = NIL;
 
-	struct config_generic **guc_vars = get_guc_variables();
-	int gucCount = GetNumConfigOptions();
+	int gucCount = 0;	
+	struct config_generic **guc_vars = guc_vars = get_guc_variables(&gucCount);
 
 	for (int gucIndex = 0; gucIndex < gucCount; gucIndex++)
 	{