diff --git a/lib/tfw/event_handler_base.py b/lib/tfw/event_handler_base.py
index f9b4a09..46a42e8 100644
--- a/lib/tfw/event_handler_base.py
+++ b/lib/tfw/event_handler_base.py
@@ -18,9 +18,8 @@ class EventHandlerBase(ABC):
 
     def event_handler_callback(self, msg_parts):
         message = deserialize_tfw_msg(*msg_parts)
-        key = message['key']
         response = self.dispatch_handling(message)
-        response['key'] = key
+        response['key'] = message['key']
         if response is None:
             return
         self.server_connector.send(response)