diff --git a/packages/webapp/.eslintrc.json b/packages/webapp/.eslintrc.json
index d83fb74a81..611ae933bb 100644
--- a/packages/webapp/.eslintrc.json
+++ b/packages/webapp/.eslintrc.json
@@ -24,7 +24,12 @@
     "amd": true,
     "node": true
   },
-  "extends": ["eslint:recommended", "plugin:react/recommended", "plugin:storybook/recommended"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:storybook/recommended",
+    "plugin:jsonc/recommended-with-json"
+  ],
   "rules": {
     "react/react-in-jsx-scope": "off",
     "react/prop-types": "off",
diff --git a/packages/webapp/lint-staged.config.js b/packages/webapp/lint-staged.config.js
index 82bdebd7ab..539e22131d 100644
--- a/packages/webapp/lint-staged.config.js
+++ b/packages/webapp/lint-staged.config.js
@@ -1,5 +1,5 @@
 export default {
   '*.{js,jsx}': ['eslint --quiet --fix'],
-  '*.{js,jsx,ts,tsx,json,md,html}': 'prettier --write',
+  '*.{js,jsx,ts,tsx,json,md,html}': ['prettier --write', 'eslint --quiet --fix'],
   '*.{ts,tsx}': [() => 'tsc -p tsconfig.json --noEmit'],
 };