diff --git a/tfw/components/fsm/fsm_handler.py b/tfw/components/fsm/fsm_handler.py
index 61f901e..c9cb6eb 100644
--- a/tfw/components/fsm/fsm_handler.py
+++ b/tfw/components/fsm/fsm_handler.py
@@ -31,7 +31,8 @@ class FSMHandler:
             LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)
 
     def handle_step(self, message):
-        return message if self.fsm.step(message['trigger']) else None
+        if self.fsm.step(message['trigger']):
+            return message
 
     def handle_update(self, message):
         # pylint: disable=no-self-use