diff --git a/gpcontrib/orca/include/optimizer/orca_guc.h b/gpcontrib/orca/include/optimizer/orca_guc.h
index 958a02450725..ad55e7adaad9 100644
--- a/gpcontrib/orca/include/optimizer/orca_guc.h
+++ b/gpcontrib/orca/include/optimizer/orca_guc.h
@@ -91,6 +91,7 @@ extern bool optimizer_force_comprehensive_join_implementation;
 extern bool optimizer_enable_replicated_table;
 extern bool optimizer_enable_foreign_table;
 extern bool optimizer_enable_right_outer_join;
+extern bool optimizer_enable_query_parameter;
 
 /* Optimizer plan enumeration related GUCs */
 extern bool optimizer_enumerate_plans;
diff --git a/gpcontrib/orca/orca_guc.c b/gpcontrib/orca/orca_guc.c
index 7c7f02cbea7b..cffdd8a437dc 100644
--- a/gpcontrib/orca/orca_guc.c
+++ b/gpcontrib/orca/orca_guc.c
@@ -85,6 +85,7 @@ bool optimizer_force_comprehensive_join_implementation;
 bool optimizer_enable_replicated_table;
 bool optimizer_enable_foreign_table;
 bool optimizer_enable_right_outer_join;
+bool optimizer_enable_query_parameter;
 
 /* Optimizer plan enumeration related GUCs */
 bool optimizer_enumerate_plans;
@@ -891,6 +892,15 @@ struct config_bool configure_names_bool_orca[] = {
 	 NULL,
 	 NULL},
 
+	{{"optimizer_enable_query_parameter", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enable query parameters in Orca."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_query_parameter,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
 	{{"optimizer_enable_coordinator_only_queries", PGC_USERSET,
 	  QUERY_TUNING_METHOD,
 	  gettext_noop("Process coordinator only queries via the optimizer."), NULL,
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index d9b9816b72bb..14971e82844d 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -276,8 +276,6 @@ bool		gp_force_random_redistribution = false;
 bool		optimizer;
 bool		optimizer_control = true;
 
-bool		optimizer_enable_query_parameter;
-
 /* Analyze related GUCs for external planner */
 bool		optimizer_analyze_root_partition;
 bool		optimizer_analyze_midlevel_partition;
@@ -1943,16 +1941,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false,
 		NULL, NULL, NULL
 	},
-	{
-		{"optimizer_enable_query_parameter", PGC_USERSET, DEVELOPER_OPTIONS,
-		 gettext_noop("Enable query parameters in Orca."),
-		 NULL,
-		 GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_query_parameter,
-		true,
-		NULL, NULL, NULL
-	},
 	{
 		{"gp_log_suboverflow_statement", PGC_SUSET, LOGGING_WHAT,
 		 gettext_noop("Enable logging of statements that cause subtransaction overflow."),
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index bb5bacfabcf0..62c3e3a15dff 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -427,8 +427,6 @@ extern bool create_restartpoint_on_ckpt_record_replay;
 extern bool	optimizer;
 extern bool optimizer_control;	/* controls whether the user can change the setting of the "optimizer" guc */
 
-extern bool optimizer_enable_query_parameter;
-
 /* Analyze related GUCs for external planner */
 extern bool optimizer_analyze_root_partition;
 extern bool optimizer_analyze_midlevel_partition;
diff --git a/src/include/utils/unsync_guc_name.h b/src/include/utils/unsync_guc_name.h
index 2eaacbfeb79a..ae0940017dc0 100644
--- a/src/include/utils/unsync_guc_name.h
+++ b/src/include/utils/unsync_guc_name.h
@@ -336,7 +336,6 @@
 		"optimizer_control",
 		"optimizer_enable_master_only_queries",
 		"optimizer_enable_motions_masteronly_queries",
-		"optimizer_enable_query_parameter",
 		"optimizer_replicated_table_insert",
 		"parallel_leader_participation",
 		"parallel_setup_cost",