===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- src/usr.bin/tmux/server-client.c	2021/04/05 14:11:05	1.371
+++ src/usr.bin/tmux/server-client.c	2021/04/12 09:36:12	1.372
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.371 2021/04/05 14:11:05 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.372 2021/04/12 09:36:12 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1311,7 +1311,11 @@
 	 * immediately rather than queued.
 	 */
 	if (~c->flags & CLIENT_READONLY) {
-		status_message_clear(c);
+		if (c->message_string != NULL) {
+			if (c->message_ignore_keys)
+				return (0);
+			status_message_clear(c);
+		}
 		if (c->overlay_key != NULL) {
 			switch (c->overlay_key(c, event)) {
 			case 0: