diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90c89e1..79a0152 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,8 +24,8 @@ jobs:
           cache: 'pnpm'
 
       - run: pnpm -r install --frozen-lockfile
-      - run: pnpm format:check
-      - run: pnpm lint
+      - run: pnpm --if-present format:check
+      - run: pnpm --if-present lint
 
   image:
     runs-on: ubuntu-latest
diff --git a/package.json b/package.json
index 9612b69..75ebee0 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "start": "pnpm docker:drop && docker compose -f docker-compose.yml up",
     "docker:build": "docker buildx build --tag wireadmin .",
     "docker:drop": "docker compose rm -fsv",
-    "format": "prettier --write . && pnpm -r format",
-    "format:check": "prettier --check . && pnpm -r format:check"
+    "format": "prettier --write . && pnpm --if-present -r format",
+    "format:check": "prettier --check . && pnpm --if-present -r format:check"
   },
   "keywords": [],
   "license": "GPL-3.0",