diff --git a/protocol.c b/protocol.c
index 58dad98..82c1ca7 100644
--- a/protocol.c
+++ b/protocol.c
@@ -33,10 +33,7 @@
 		break;
 	}
 
-	context->bmc_events |= (bmc_event & mask);
-	MSG_DBG("BMC Events set to: 0x%.2x\n", context->bmc_events);
-
-	return context->transport->flush_events(context);
+	return context->transport->set_events(context, (bmc_event & mask));
 }
 
 /*
@@ -48,10 +45,7 @@
  */
 int protocol_events_clear(struct mbox_context *context, uint8_t bmc_event)
 {
-	context->bmc_events &= ~bmc_event;
-	MSG_DBG("BMC Events clear to: 0x%.2x\n", context->bmc_events);
-
-	return context->transport->flush_events(context);
+	return context->transport->clear_events(context, bmc_event);
 }
 
 int protocol_v1_reset(struct mbox_context *context)