diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
index 0e4fd9653f..b901f40766 100644
--- a/.github/workflows/lint-and-test.yml
+++ b/.github/workflows/lint-and-test.yml
@@ -209,9 +209,6 @@ jobs:
         run: |
           cd packages/components && yarn build
 
-      - name: Run linting
-        run: cd packages/client && yarn lint
-
       - name: Upload filesystem as artifact
         uses: actions/upload-artifact@v4.5.0
         with:
@@ -219,6 +216,33 @@ jobs:
           path: .
           include-hidden-files: true
 
+  lint-client:
+    name: Lint client
+    needs: prepare-client-tests
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        shards: [0, 1, 2, 3, 4, 5]
+
+    steps:
+      - name: Download filesystem artifact
+        uses: actions/download-artifact@v4.1.8
+        with:
+          name: client
+          path: .
+
+      - name: Use Node.js from .nvmrc
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
+      - name: Compile
+        run: cd packages/client && yarn test:compilation
+
+      - name: Run linting
+        run: cd packages/client && yarn lint
+
   test-client:
     name: Test client
     needs: prepare-client-tests
diff --git a/packages/client/package.json b/packages/client/package.json
index 982d4ea40b..c6b8b9449d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -11,7 +11,7 @@
     "build": "NODE_OPTIONS=--max_old_space_size=8000 vite build",
     "docker:build": "docker build ../../ -f ../../Dockerfile-register -t ocrvs-client",
     "docker:run": "docker run -it --rm -p 5000:80 --name ocrvs-client ocrvs-client",
-    "test": "yarn test:compilation && NODE_OPTIONS=--max_old_space_size=8000 vitest run --coverage --silent --dangerouslyIgnoreUnhandledErrors",
+    "test": "NODE_OPTIONS=--max_old_space_size=8000 vitest run --coverage --silent --dangerouslyIgnoreUnhandledErrors",
     "test:watch": "vitest",
     "open:cov": "yarn test && opener coverage/index.html",
     "lint": "yarn lint:css && yarn lint:ts",