diff --git a/embark-ui/.eslintrc b/embark-ui/.eslintrc
new file mode 100644
index 000000000..19845d602
--- /dev/null
+++ b/embark-ui/.eslintrc
@@ -0,0 +1,6 @@
+{
+  "extends": "react-app",
+  "rules": {
+    "react/prop-types": "warn"
+  }
+}
\ No newline at end of file
diff --git a/embark-ui/package.json b/embark-ui/package.json
index fe3d479ef..eec21bdda 100644
--- a/embark-ui/package.json
+++ b/embark-ui/package.json
@@ -123,8 +123,5 @@
     "presets": [
       "react-app"
     ]
-  },
-  "eslintConfig": {
-    "extends": "react-app"
   }
 }
diff --git a/package.json b/package.json
index 707253925..0913f3f8d 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   },
   "main": "./lib/index.js",
   "scripts": {
-    "lint": "eslint bin/embark lib/",
+    "lint": "eslint bin/embark lib/ embark-ui/src",
     "prepack": "cd embark-ui && npm install && npm run build",
     "test": "npm-run-all lint test:*",
     "test:embark": "mocha test/ --no-timeouts --exit",