diff --git a/.eslintrc b/.eslintrc
index f77d508..ccc04e2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,5 @@
 {
-  "plugins": ["react", "graphql"],
+  "plugins": ["react", "graphql", "compat"],
   "parserOptions": {
     "sourceType": "module",
     "ecmaFeatures": {
@@ -18,6 +18,10 @@
   "extends": ["eslint:recommended", "plugin:react/recommended"],
   "rules": {
     "quotes": ["error", "single"],
-    "semi": ["error", "never"]
+    "semi": ["error", "never"],
+    "compat/compat": "error"
+  },
+  "settings": {
+    "polyfills": ["promises"]
   }
 }
diff --git a/package.json b/package.json
index b1a9573..77f4e86 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
   "devDependencies": {
     "babel-eslint": "^8.2.2",
     "eslint": "^4.19.1",
+    "eslint-plugin-compat": "^2.2.0",
     "eslint-plugin-graphql": "^1.5.0",
     "eslint-plugin-prettier": "^2.6.0",
     "eslint-plugin-react": "^7.7.0",
@@ -33,5 +34,8 @@
     "start": "gatsby develop",
     "format": "prettier --write 'src/**/*.js'",
     "test": "npm run lint"
-  }
+  },
+  "browserslist": [
+    "defaults"
+  ]
 }