diff --git a/.github/workflows/js_tests.yml b/.github/workflows/js_tests.yml
index 050e7f3c..83e43053 100644
--- a/.github/workflows/js_tests.yml
+++ b/.github/workflows/js_tests.yml
@@ -27,9 +27,6 @@ jobs:
       - name: Npm install
         run: |
           npm install
-      - name: Run plugin linter
-        run: |
-          npm run lint
       - name: Run custom plugin linter
         run: |
           npm run lint:custom
diff --git a/webpack/components/ConfirmModal.js b/webpack/components/ConfirmModal.js
index 81f98f11..8a35927a 100644
--- a/webpack/components/ConfirmModal.js
+++ b/webpack/components/ConfirmModal.js
@@ -11,7 +11,7 @@ const ConfirmModal = props => {
 
   const actions = [
     <Button
-      ouiaId={`oscap-conf-modal-${props.record.id}-confirm`}
+      ouiaId={`oscap-conf-modal-${props.record?.id}-confirm`}
       key="confirm"
       variant="primary"
       onClick={() => props.onConfirm(callMutation, props.record.id)}
@@ -20,7 +20,7 @@ const ConfirmModal = props => {
       {__('Confirm')}
     </Button>,
     <Button
-      ouiaId={`oscap-conf-modal-${props.record.id}-cancel`}
+      ouiaId={`oscap-conf-modal-${props.record?.id}-cancel`}
       key="cancel"
       variant="link"
       onClick={event => props.onClose()}
@@ -36,7 +36,7 @@ const ConfirmModal = props => {
 
   return (
     <Modal
-      ouiaId={`oscap-conf-modal-${props.record.id}`}
+      ouiaId={`oscap-conf-modal-${props.record?.id}`}
       variant={ModalVariant.medium}
       title={props.title}
       isOpen={props.isOpen}