diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
index b3f5f1f9..11131488 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
@@ -361,8 +361,8 @@
                     END
                 ) AS fault_level,
                 mst.update_optname AS user_name,
-                mst.fault_desc AS fault_desc,
-                mst.invstatus AS status
+                st.fault_desc AS fault_desc,
+                st.status AS status
             FROM
             	EM_BI_DeviceRepairRequest st
             	LEFT JOIN EM_BI_EquipmentFile file ON st.devicerecord_id = file.devicerecord_id
@@ -372,7 +372,7 @@
             WHERE
                 st.is_delete = '0'
                 AND (st.status <> '99')
-                AND mst.invstatus not in ('06','07','99')
+                AND (mst.invstatus not in ('06','07','99') or isnull(mst.invstatus))
 
         UNION