diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index bacf82a46..7f39ab9e7 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -428,15 +428,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                             int phase = agvNdcTwoDeviceDriver.getPhase();
                             if (phase == 0x03 || phase == 0x05 || phase == 0x08) {
                                 StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
-                                Device device_k = deviceAppService.findDeviceByCode(device_code + "_K");
-                                Device device_m = deviceAppService.findDeviceByCode(device_code + "_M");
-                                if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
-                                    standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver();
-                                    standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
-                                    standardOrdinarySiteDeviceDriver.setTask_code(task_code);
-                                }
-                                if (device_m.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
-                                    standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_m.getDeviceDriver();
+                                Device deviceByCode = deviceAppService.findDeviceByCode(device_code);
+                                if (deviceByCode.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
+                                    standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) deviceByCode.getDeviceDriver();
                                     standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
                                     standardOrdinarySiteDeviceDriver.setTask_code(task_code);
                                 }