diff --git a/server-window.c b/server-window.c
index 8f3e2b63..8b34fc6c 100644
--- a/server-window.c
+++ b/server-window.c
@@ -75,12 +75,14 @@ server_window_check_bell(struct session *s, struct winlink *wl)
 	if (s->curw != wl || s->flags & SESSION_UNATTACHED)
 		wl->flags |= WINLINK_BELL;
 	if (s->flags & SESSION_UNATTACHED)
-		return (1);
+		return (0);
 	if (s->curw->window == wl->window)
 		w->flags &= ~WINDOW_BELL;
 
 	visual = options_get_number(&s->options, "visual-bell");
 	action = options_get_number(&s->options, "bell-action");
+	if (action == BELL_NONE)
+		return (0);
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
 		if (c == NULL || c->session != s)