diff --git a/assets/share/assignment/dispatch/EMPTY_SLOT.SEARCH.png b/assets/share/assignment/dispatch/EMPTY_SLOT.SEARCH.png
index 3935824f7..6b2f01bda 100644
Binary files a/assets/share/assignment/dispatch/EMPTY_SLOT.SEARCH.png and b/assets/share/assignment/dispatch/EMPTY_SLOT.SEARCH.png differ
diff --git a/tasks/assignment/assets/assets_assignment_dispatch.py b/tasks/assignment/assets/assets_assignment_dispatch.py
index 9a1fe40ab..daa797545 100644
--- a/tasks/assignment/assets/assets_assignment_dispatch.py
+++ b/tasks/assignment/assets/assets_assignment_dispatch.py
@@ -186,7 +186,7 @@ EMPTY_SLOT = ButtonWrapper(
     share=Button(
         file='./assets/share/assignment/dispatch/EMPTY_SLOT.png',
         area=(1075, 562, 1110, 597),
-        search=(873, 543, 1099, 609),
+        search=(873, 542, 1136, 608),
         color=(200, 200, 195),
         button=(1075, 562, 1110, 597),
     ),
diff --git a/tasks/assignment/assignment.py b/tasks/assignment/assignment.py
index 93dd218bd..a1f29bc3f 100644
--- a/tasks/assignment/assignment.py
+++ b/tasks/assignment/assignment.py
@@ -42,9 +42,9 @@ class Assignment(AssignmentClaim, SynthesizeUI):
             if isinstance(g, AssignmentEventGroup)
         ), None)
         if event_first and event_ongoing is not None:
-            undispatched = assignments
             remain = self._check_all()
             remain = self._dispatch_event(remain)
+            undispatched = [x for x in assignments if x not in self.dispatched]
         else:
             # Iterate in user-specified order, return undispatched ones
             undispatched = list(self._check_inlist(assignments, duration))
diff --git a/tasks/assignment/dispatch.py b/tasks/assignment/dispatch.py
index e2d0d6f07..e8212a3e3 100644
--- a/tasks/assignment/dispatch.py
+++ b/tasks/assignment/dispatch.py
@@ -92,7 +92,8 @@ class AssignmentDispatch(AssignmentUI):
                 logger.info('Characters are all selected')
                 break
             # Ensure character list
-            if not self.appear(CHARACTER_LIST):
+            # Search EMPTY_SLOT to load offset
+            if not self.appear(CHARACTER_LIST) and self.appear(EMPTY_SLOT):
                 if self.interval_is_reached(CHARACTER_LIST, interval=2):
                     self.interval_reset(CHARACTER_LIST, interval=2)
                     self.device.click(EMPTY_SLOT)