diff --git a/src/control_backend/core/agent_system.py b/src/control_backend/core/agent_system.py
index fffa282..5b2ea7e 100644
--- a/src/control_backend/core/agent_system.py
+++ b/src/control_backend/core/agent_system.py
@@ -133,6 +133,7 @@ class BaseAgent(ABC):
 
         :param message: The message to send.
         """
+        message.sender = self.name
         to = message.to
         receivers = [to] if isinstance(to, str) else to