diff --git a/lib/tfw/networking/server/tfw_server.py b/lib/tfw/networking/server/tfw_server.py
index ff5a90c..28aa242 100644
--- a/lib/tfw/networking/server/tfw_server.py
+++ b/lib/tfw/networking/server/tfw_server.py
@@ -12,6 +12,7 @@ class TFWServer:
     def __init__(self, fsm_type):
         self._fsm = fsm_type()
         self.fsm_updater = FSMUpdater(self._fsm)
+        self.fsm_manager = FSMManager(self._fsm)
         self._fsm.subscribe(self.fsm_updater.update)
 
         self.application = Application(
@@ -26,7 +27,7 @@ class TFWServer:
 
     def make_response(self, message):
         trigger = message.get('trigger', '')
-        try: self.fsm.trigger(trigger, message=message)
+        try: self.fsm_manager.trigger(trigger, message)
         except AttributeError: log.debug('FSM failed to execute nonexistent trigger: "{}"'.format(trigger))
         return message