diff --git a/src/fetch/client.h b/src/fetch/client.h
index 524efa2a..79c8b772 100644
--- a/src/fetch/client.h
+++ b/src/fetch/client.h
@@ -5,7 +5,8 @@ bool check_hit_no_border(Client *c) {
 	}
 
 	if (c->mon && !c->mon->isoverview &&
-		c->mon->pertag->no_render_border[get_tags_first_tag_num(c->tags)]) {
+		c->mon->pertag->no_render_border[get_tags_first_tag_num(
+			c->tags ? c->tags : c->mon->tagset[c->mon->seltags])]) {
 		hit_no_border = true;
 	}