diff --git a/server-client.c b/server-client.c
index 864b37b3..4109c1df 100644
--- a/server-client.c
+++ b/server-client.c
@@ -2221,7 +2221,8 @@ server_client_check_pane_buffer(struct window_pane *wp)
 		}
 		wpo = control_pane_offset(c, wp, &flag);
 		if (wpo == NULL) {
-			off = 0;
+			if (!flag)
+				off = 0;
 			continue;
 		}
 		if (!flag)