diff --git a/.eslintrc.json b/.eslintrc.json
index 8b14ec2661..232183ed8b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,7 +5,7 @@
     "mocha": true,
     "node": true
   },
-  "parser": "@typescript-eslint/parser",
+  "parser": "babel-eslint",
   "root": true,
   "extends": [
     "./.eslintrc-base.json",
@@ -46,6 +46,7 @@
   },
   "overrides": [{
     "files": ["**/*.ts?(x)"],
+    "parser": "@typescript-eslint/parser",
     "parserOptions": {
       "tsconfigRootDir": "./client",
       "project": ["./tsconfig.json"]
diff --git a/package-lock.json b/package-lock.json
index ba55f68397..bb3ffddabf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,6 +59,31 @@
         }
       }
     },
+    "@babel/eslint-parser": {
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.3.tgz",
+      "integrity": "sha512-IfJXKEVRV/Gisvgmih/+05gkBzzg4Dy0gcxkZ84iFiLK8+O+fI1HLnGJv3UrUMPpsMmmThNa69v+UnF80XP+kA==",
+      "dev": true,
+      "requires": {
+        "eslint-scope": "^5.1.0",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
     "@babel/generator": {
       "version": "7.14.1",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz",
diff --git a/package.json b/package.json
index 3d2030fe37..2e3a7182e5 100644
--- a/package.json
+++ b/package.json
@@ -97,6 +97,7 @@
     "invariant": "2.2.4"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "7.14.3",
     "@babel/plugin-proposal-function-bind": "7.12.13",
     "@babel/preset-env": "7.14.2",
     "@babel/preset-react": "7.13.13",