diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index a9b6c315..9d2cdd0e 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -51,8 +51,9 @@ jobs:
       - name: Security audit
         run: npm run security
 
-      - name: Check commit message
-        uses: wagoid/commitlint-github-action@v5
+      - name: Validate PR commits with commitlint
+        if: github.event_name == 'pull_request'
+        run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose
 
   test:
     name: Test - ${{ matrix.os }} - Node v${{ matrix.node-version }}, Webpack ${{ matrix.webpack-version }}