diff --git a/frontend/lint-staged.config.js b/frontend/lint-staged.config.js
new file mode 100644
index 000000000..4db7d0066
--- /dev/null
+++ b/frontend/lint-staged.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+  '**/*.{js,ts,html,md,json}': 'prettier --write',
+  '*.ts': 'tslint --fix',
+  'projects/ui/**/*.ts': () => 'npm run check:ui',
+  'projects/shared/**/*.ts': () => 'npm run check:shared',
+  'projects/diagnostic-ui/**/*.ts': () => 'npm run check:diagnostic-ui',
+  'projects/setup-wizard/**/*.ts': () => 'npm run check:setup-wizard',
+}
diff --git a/frontend/package.json b/frontend/package.json
index b8033fa25..1dfef47e0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -84,11 +84,7 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged && npm run check"
+      "pre-commit": "lint-staged --concurrent false"
     }
-  },
-  "lint-staged": {
-    "**/*.{js,ts,html,md,less,json}": "prettier --write",
-    "*.ts": "tslint --fix"
   }
 }