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 6f6a088..5131494 100644
--- a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
+++ b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
@@ -183,15 +183,9 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
 
             # Ignore updates for channels that are not setup through num_connected_channels
             index = int(attr_name[3:])  # Extract index from 'mcaX'
-            if index > self.num_connected_channels:
+            if index > self.NUM_MCA_CHANNELS:
                 return
 
-            mca_channel = getattr(self, attr_name, None)
-            if mca_channel is None:
-                logger.error(f"Could not find matching MCA channel for signal {signal.name}")
-                return
-            mca_channel: AsyncSignal
-
             if isinstance(value, np.ndarray):
                 value = value.tolist()  # Convert numpy array to list
             else: