diff --git a/transport_mbox.c b/transport_mbox.c
index 671e1c4..340a526 100644
--- a/transport_mbox.c
+++ b/transport_mbox.c
@@ -591,7 +591,8 @@
 
 	if (context->transport != old_transport &&
 			context->transport == &transport_mbox_ops) {
-		transport_mbox_flush_events(context);
+		/* A bit messy, but we need the correct event mask */
+		protocol_events_set(context, context->bmc_events);
 	}
 
 	return rc;