diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 6f326fe24..f9fe4c293 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -3739,7 +3739,7 @@ static const struct command_registration gdb_command_handlers[] = {
 	{
 		.name = "gdb_port",
 		.handler = handle_gdb_port_command,
-		.mode = COMMAND_ANY,
+		.mode = COMMAND_CONFIG,
 		.help = "Normally gdb listens to a TCP/IP port. Each subsequent GDB "
 			"server listens for the next port number after the "
 			"base port number specified. "
diff --git a/src/server/server.c b/src/server/server.c
index f32a9c76f..07b7ae487 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -799,7 +799,7 @@ static const struct command_registration server_command_handlers[] = {
 	{
 		.name = "bindto",
 		.handler = &handle_bindto_command,
-		.mode = COMMAND_ANY,
+		.mode = COMMAND_CONFIG,
 		.usage = "[name]",
 		.help = "Specify address by name on which to listen for "
 			"incoming TCP/IP connections",
diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index 1735c43ff..1ecb827a1 100644
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -331,7 +331,7 @@ static const struct command_registration tcl_command_handlers[] = {
 	{
 		.name = "tcl_port",
 		.handler = handle_tcl_port_command,
-		.mode = COMMAND_ANY,
+		.mode = COMMAND_CONFIG,
 		.help = "Specify port on which to listen "
 			"for incoming Tcl syntax.  "
 			"Read help on 'gdb_port'.",
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index a864f5fd2..bfabae833 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -705,7 +705,7 @@ static const struct command_registration telnet_command_handlers[] = {
 	{
 		.name = "telnet_port",
 		.handler = handle_telnet_port_command,
-		.mode = COMMAND_ANY,
+		.mode = COMMAND_CONFIG,
 		.help = "Specify port on which to listen "
 			"for incoming telnet connections.  "
 			"Read help on 'gdb_port'.",