diff --git a/.eslintrc.js b/.eslintrc.js
index b478bcc3f..f4b59595a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -40,9 +40,7 @@ module.exports = {
     react: {
       version: 'detect',
     },
-    'import/extensions': [
-      '.js',
-    ],
+    'import/extensions': ['.js', '.jsx', '.ts', '.tsx'],
     'import/ignore': [
       'node_modules',
       '\\.(css|scss|json)$',
@@ -257,9 +255,17 @@ module.exports = {
   overrides: [
     {
       files: ['**/*.tsx'],
-      'rules': {
+      rules: {
         'react/prop-types': 'off',
       },
     },
+    // Disable no-undef in TypeScript
+    // https://stackoverflow.com/a/69155899
+    {
+      files: ['*.ts', '*.tsx'],
+      rules: {
+        'no-undef': 'off',
+      },
+    },
   ],
 };