diff --git a/src/signage/src/signage/route_handler.py b/src/signage/src/signage/route_handler.py
index 52152cf..104f3e1 100644
--- a/src/signage/src/signage/route_handler.py
+++ b/src/signage/src/signage/route_handler.py
@@ -91,8 +91,12 @@ def emergency_checker_callback(self):
                 MrmState.COMFORTABLE_STOP,
                 MrmState.PULL_OVER,
             ]:
-                self._in_slowing_state = self._autoware.information.motion_state == MotionState.MOVING
-                self._in_slow_stop_state = self._autoware.information.motion_state == MotionState.STOPPED
+                self._in_slowing_state = (
+                    self._autoware.information.motion_state == MotionState.MOVING
+                )
+                self._in_slow_stop_state = (
+                    self._autoware.information.motion_state == MotionState.STOPPED
+                )
             else:
                 self._in_slowing_state = False
                 self._in_slow_stop_state = False
@@ -301,7 +305,7 @@ def route_checker_callback(self):
                     self._service_interface.trigger_external_signage(True)
                     self._trigger_external_signage = True
                     self._announce_engage = True
-            elif self._autoware.information.route_state == RouteState.ARRIVED:
+            elif self._autoware.information.route_state in [RouteState.ARRIVED, RouteState.UNSET]:
                 # Check whether the vehicle arrive to goal
                 self._is_driving = False
                 self._is_stopping = True