diff --git a/interlocking/interlockingcontroller/signalcontroller.py b/interlocking/interlockingcontroller/signalcontroller.py
index 9badc91..7eb5def 100644
--- a/interlocking/interlockingcontroller/signalcontroller.py
+++ b/interlocking/interlockingcontroller/signalcontroller.py
@@ -11,8 +11,11 @@ def __init__(self, infrastructure_providers):
 
     async def reset(self):
         # Run non-concurrently
-        for signal_id in self.signals:
-            await self.set_signal_halt(self.signals[signal_id])
+        for signal in self.signals.values():
+            await self.set_signal_halt(signal)
+            signal.state = OccupancyState.FREE
+            signal.used_by = set()
+
 
     async def set_route(self, route, train_id: str):
         result = await self.set_signal_go(route.start_signal)