error_count++;
                        }
 
-               if (i == QMAN_STREAMS && error_count) {
-                       /* check for undefined opcode */
-                       if (glbl_sts_val & PDMA0_QM_GLBL_ERR_STS_CP_UNDEF_CMD_ERR_MASK &&
-                                       hdev->captured_err_info.undef_opcode.write_enable) {
+               /* check for undefined opcode */
+               if (glbl_sts_val & PDMA0_QM_GLBL_ERR_STS_CP_UNDEF_CMD_ERR_MASK) {
+                       *event_mask |= HL_NOTIFIER_EVENT_UNDEFINED_OPCODE;
+                       if (hdev->captured_err_info.undef_opcode.write_enable) {
                                memset(&hdev->captured_err_info.undef_opcode, 0,
                                                sizeof(hdev->captured_err_info.undef_opcode));
-
-                               hdev->captured_err_info.undef_opcode.write_enable = false;
                                hdev->captured_err_info.undef_opcode.timestamp = ktime_get();
                                hdev->captured_err_info.undef_opcode.engine_id =
                                                        gaudi2_queue_id_to_engine_id[qid_base];
-                               *event_mask |= HL_NOTIFIER_EVENT_UNDEFINED_OPCODE;
                        }
 
-                       handle_lower_qman_data_on_err(hdev, qman_base, *event_mask);
+                       if (i == QMAN_STREAMS)
+                               handle_lower_qman_data_on_err(hdev, qman_base, *event_mask);
                }
        }