diff --git a/.eslintrc.js b/.eslintrc.js
index a8a08d5..027398b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,7 +5,11 @@ module.exports = {
     project: "./tsconfig.json"
   },
   plugins: ["@typescript-eslint"],
-  extends: ["plugin:@typescript-eslint/recommended"],
+  extends: [
+    "plugin:@typescript-eslint/recommended",
+    "prettier",
+    "prettier/@typescript-eslint"
+  ],
   rules: {
     "@typescript-eslint/no-unused-vars": "off"
   }
diff --git a/package.json b/package.json
index 8286a0f..09c605b 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "@types/react-dom": "^16.8.2",
     "@typescript-eslint/eslint-plugin": "^1.5.0",
     "@typescript-eslint/parser": "^1.5.0",
+    "eslint-config-prettier": "4.1.0",
     "husky": "^1.3.1",
     "lint-staged": "^8.1.5",
     "prettier": "1.16.4",
diff --git a/yarn.lock b/yarn.lock
index 8c69a77..777001d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3431,6 +3431,13 @@ escodegen@^1.9.1:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-config-prettier@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.1.0.tgz#181364895899fff9fd3605fecb5c4f20e7d5f395"
+  integrity sha512-zILwX9/Ocz4SV2vX7ox85AsrAgXV3f2o2gpIicdMIOra48WYqgUnWNH/cR/iHtmD2Vb3dLSC3LiEJnS05Gkw7w==
+  dependencies:
+    get-stdin "^6.0.0"
+
 eslint-config-react-app@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-3.0.8.tgz#6f606828ba30bafee7d744c41cd07a3fea8f3035"