diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 7d501b44f..4a18198d6 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -2944,6 +2944,11 @@ static int gdb_target_add_one(struct target *target)
 
 int gdb_target_add_all(struct target *target)
 {
+	if (strcmp(gdb_port, "disabled") == 0) {
+		LOG_INFO("gdb server disabled");
+		return ERROR_OK;
+	}
+
 	if (NULL == target) {
 		LOG_WARNING("gdb services need one or more targets defined");
 		return ERROR_OK;