diff --git a/modules/core/core.py b/modules/core/core.py
index 88470c2..5a838c1 100644
--- a/modules/core/core.py
+++ b/modules/core/core.py
@@ -224,9 +224,7 @@ class CraftBeerPi(ActorAPI, SensorAPI):
     def notify(self, headline, message, type="success", timeout=5000):
         self.beep()
         msg = {"id": str(uuid.uuid1()), "type": type, "headline": headline, "message": message, "timeout": timeout}
-        if timeout is None:
-            self.cache["messages"].append(msg)
-        self.emit("NOTIFY", msg)
+        self.emit_message(msg)
 
     def beep(self):
         if self.buzzer is not None:
diff --git a/modules/notification/__init__.py b/modules/notification/__init__.py
index 158beef..2f440cb 100644
--- a/modules/notification/__init__.py
+++ b/modules/notification/__init__.py
@@ -32,10 +32,9 @@ def messageEvent(message, **kwargs):
     :param kwargs: other parameter
     :return: None
     """
-
-    msg = {"id": len(cbpi.cache["messages"]), "type": "info", "message": message, "read": False}
-    cbpi.cache["messages"].append(msg)
-    cbpi.emit('MESSAGE', msg,)
+    if message["timeout"] is None:
+        cbpi.cache["messages"].append(message)
+    cbpi.emit("NOTIFY", message)
 
 @cbpi.initalizer(order=2)
 def init(cbpi):