diff --git a/src/flash/nor/core.c b/src/flash/nor/core.c
index cc2ecac08..4410d5c6a 100644
--- a/src/flash/nor/core.c
+++ b/src/flash/nor/core.c
@@ -232,6 +232,9 @@ int get_flash_bank_by_addr(struct target *target,
 
 	/* cycle through bank list */
 	for (c = flash_banks; c; c = c->next) {
+		if (c->target != target)
+			continue;
+
 		int retval;
 		retval = c->driver->auto_probe(c);
 
@@ -240,7 +243,7 @@ int get_flash_bank_by_addr(struct target *target,
 			return retval;
 		}
 		/* check whether address belongs to this flash bank */
-		if ((addr >= c->base) && (addr <= c->base + (c->size - 1)) && target == c->target) {
+		if ((addr >= c->base) && (addr <= c->base + (c->size - 1))) {
 			*result_bank = c;
 			return ERROR_OK;
 		}
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index c578780c8..28cb3ab71 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -957,6 +957,9 @@ static int gdb_new_connection(struct connection *connection)
 		int i;
 		for (i = 0; i < flash_get_bank_count(); i++) {
 			struct flash_bank *p;
+			p = get_flash_bank_by_num_noprobe(i);
+			if (p->target != gdb_service->target)
+				continue;
 			retval = get_flash_bank_by_num(i, &p);
 			if (retval != ERROR_OK) {
 				LOG_ERROR("Connect failed. Consider setting up a gdb-attach event for the target " \
@@ -1732,14 +1735,16 @@ static int gdb_memory_map(struct connection *connection,
 	banks = malloc(sizeof(struct flash_bank *)*flash_get_bank_count());
 
 	for (i = 0; i < flash_get_bank_count(); i++) {
+		p = get_flash_bank_by_num_noprobe(i);
+		if (p->target != target)
+			continue;
 		retval = get_flash_bank_by_num(i, &p);
 		if (retval != ERROR_OK) {
 			free(banks);
 			gdb_error(connection, retval);
 			return retval;
 		}
-		if (p->target == target)
-			banks[target_flash_banks++] = p;
+		banks[target_flash_banks++] = p;
 	}
 
 	qsort(banks, target_flash_banks, sizeof(struct flash_bank *),