diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index 722ce8ad68dc0812a43143345a9d94feff5357fa..9b7ce2f43c9a546a892a3b268f7e86230df5974e 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -4010,7 +4010,7 @@ struct config_int ConfigureNamesInt_gp[] =
 		{"gp_connections_per_thread", PGC_BACKEND, GP_ARRAY_TUNING,
 			gettext_noop("Sets the number of client connections handled in each thread."),
 			NULL,
-			GUC_NOT_IN_SAMPLE | GUC_GPDB_ADDOPT
+			GUC_GPDB_ADDOPT
 		},
 		&gp_connections_per_thread,
 		512, 0, INT_MAX, assign_gp_connections_per_thread, show_gp_connections_per_thread
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index c0d25d1810fbc93391d05950488b510ce6381974..1b395c72dcf7bab993d1260eca5438dc893592b1 100755
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -541,7 +541,7 @@ gp_interconnect_type=udpifc
 
 # - Worker Process Creation -
 
-gp_connections_per_thread = 64
+gp_connections_per_thread = 0
 gp_segment_connect_timeout = 600s
 
 # - Resource limits -