diff --git a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
index b37fbd2..bb4a373 100644
--- a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
+++ b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
@@ -510,7 +510,7 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
         """Monitor data emission after scan is done."""
         while not self._scan_done_thread_kill_event.is_set():
             while self._start_monitor_async_data_emission.wait():
-                if self._current_data_index == self._num_total_triggers:
+                if self._current_data_index == self.scan_info.msg.num_points:
                     for callback in self._scan_done_callbacks:
                         callback()