diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index c1c6a36c9d..aa3a4471d8 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -54,6 +54,10 @@ bb.utils._context["NotHandled"] = NotHandled
 bb.utils._context["Handled"] = Handled
 
 def fire_class_handlers(event, d):
+    import bb.msg
+    if isinstance(event, bb.msg.MsgBase):
+        return
+
     for handler in _handlers:
         h = _handlers[handler]
         event.data = d