diff --git a/.eslintrc.json b/.eslintrc.json
index 237650932..8ca153cbc 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,7 +3,9 @@
         "es6": true,
         "node": true
     },
-    "extends": "eslint:recommended",
+    "extends": [
+      "eslint:recommended"
+    ],
     "parserOptions": {
         "ecmaVersion": 2017
     },
@@ -12,9 +14,7 @@
       "json"
     ],
     "rules": {
-        "indent": ["error",
-            2
-        ],
+        "indent": ["error", 2],
         "no-console": "off",
         "linebreak-style": ["error", "unix"],
         "quotes": ["error", "single"],
@@ -29,7 +29,7 @@
         "no-global-assign": "error",
         "no-implied-eval": "error",
         "lines-around-comment": ["warn", {"beforeLineComment": true}],
-        "spaced-comment": ["warn", "always", { "line": { "exceptions": ["-", "="] } }],
+        "spaced-comment": ["warn", "always", {"line": {"exceptions": ["-", "="]}}],
         "no-script-url": "error",
         "no-throw-literal": "error",
         "yoda": "warn",
@@ -41,32 +41,20 @@
         "object-curly-spacing": "warn",
         "space-infix-ops": ["error"],
         "space-in-parens": ["error", "never"],
-        "space-unary-ops": ["error", {
-          "words": true,
-          "nonwords": false
-        }],
+        "space-unary-ops": ["error", {"words": true, "nonwords": false}],
         "no-const-assign": "error",
         "no-duplicate-imports": "error",
         "prefer-template": "warn",
-        "comma-spacing": ["error", {
-            "after": true
-        }],
+        "comma-spacing": ["error", {"after": true}],
         "no-var": "error",
         "no-lonely-if": "error",
         "curly": "error",
-        "no-unused-vars": ["error", {
-            "argsIgnorePattern": "^_|next",
-            "varsIgnorePattern": "^_"
-        }],
-        "no-multiple-empty-lines": ["error", {
-            "max": 1
-        }],
-        "newline-per-chained-call": ["error", {
-            "ignoreChainWithDepth": 2
-        }],
+        "no-unused-vars": ["error", {"argsIgnorePattern": "^_|next", "varsIgnorePattern": "^_"}],
+        "no-multiple-empty-lines": ["error", {"max": 1}],
+        "newline-per-chained-call": ["error", {"ignoreChainWithDepth": 2}],
         "promise/no-return-wrap": "error",
         "promise/param-names": "error",
-        "promise/catch-or-return": "error",
+        "promise/catch-or-return": "warn",
         "promise/no-native": "off",
         "promise/no-nesting": "warn",
         "promise/no-promise-in-callback": "warn",
diff --git a/client/coral-admin/src/routes/Community/components/FlaggedUser.js b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
index 5b2238592..81d7790fe 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedUser.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
@@ -85,7 +85,7 @@ class User extends React.Component {
                 <span className={styles.flaggedByLabel}>
                   {t('community.flags')}({ user.actions.length })
                 </span>:
-                  { user.action_summaries.map(
+                { user.action_summaries.map(
                   (action, i) => {
                     return <span className={styles.flaggedBy} key={i}>
                       {shortReasons[action.reason]} ({action.count})
diff --git a/client/coral-embed-stream/src/components/StreamTabPanel.js b/client/coral-embed-stream/src/components/StreamTabPanel.js
index a511ac555..50f54c2a0 100644
--- a/client/coral-embed-stream/src/components/StreamTabPanel.js
+++ b/client/coral-embed-stream/src/components/StreamTabPanel.js
@@ -15,8 +15,8 @@ class StreamTabPanel extends React.Component {
         {loading
           ? <div className={styles.spinnerContainer}><Spinner /></div>
           : <TabContent activeTab={activeTab} sub={sub}>
-              {tabPanes}
-            </TabContent>
+            {tabPanes}
+          </TabContent>
         }
       </div>
     );
diff --git a/graph/loaders/users.js b/graph/loaders/users.js
index ac3493479..0cceaf33f 100644
--- a/graph/loaders/users.js
+++ b/graph/loaders/users.js
@@ -27,7 +27,7 @@ const genUserByIDs = async (context, ids) => {
  * @param  {Object} context   graph context
  * @param  {Object} query     query terms to apply to the users query
  */
-const getUsersByQuery = async ({user, loaders: {Actions}}, {ids, limit, cursor, statuses, action_type, sortOrder}) => {
+const getUsersByQuery = async ({loaders: {Actions}}, {ids, limit, cursor, statuses, action_type, sortOrder}) => {
 
   let query = UserModel.find();
 
diff --git a/package.json b/package.json
index 3d054e0d6..afb457d35 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "build": "WEBPACK=TRUE NODE_ENV=production webpack -p --config webpack.config.js --bail",
     "prebuild-watch": "yarn generate-introspection",
     "build-watch": "WEBPACK=TRUE NODE_ENV=development webpack --progress --config webpack.config.js --watch",
-    "lint": "eslint --ext .json bin/* .",
-    "lint-fix": "eslint bin/* . --fix",
+    "lint": "eslint --ext=.js --ext=.json bin/* .",
+    "lint-fix": "npm run lint -- --fix",
     "test": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
     "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec",
     "heroku-postbuild": "./bin/cli plugins reconcile && yarn build",