diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json
index 9f3cdd6325..2433bc0538 100644
--- a/.eslintrc.es6.json
+++ b/.eslintrc.es6.json
@@ -40,7 +40,6 @@
     "jsx-a11y/alt-text": 0,
     "func-names": 0,
     "object-shorthand": 0,
-    "consistent-return": 0,
     "import/extensions": 0,
     "import/no-extraneous-dependencies": 0,
     "camelcase": 0,
diff --git a/assets/js/src/help/system_status.jsx b/assets/js/src/help/system_status.jsx
index 8b5ddd5db2..f4750aba56 100644
--- a/assets/js/src/help/system_status.jsx
+++ b/assets/js/src/help/system_status.jsx
@@ -42,7 +42,7 @@ function renderCronSection(data) {
 }
 
 function renderMSSSection(data) {
-  if (!data.mss.enabled) return;
+  if (!data.mss.enabled) return undefined;
 
   const status = data.mss.enabled.isReachable;
 
diff --git a/assets/js/src/newsletters/send/standard.jsx b/assets/js/src/newsletters/send/standard.jsx
index 57334a1502..d84f19b0f4 100644
--- a/assets/js/src/newsletters/send/standard.jsx
+++ b/assets/js/src/newsletters/send/standard.jsx
@@ -217,7 +217,7 @@ define(
       },
       propagateChange: function () {
         if (this.props.onChange) {
-          return this.props.onChange({
+          this.props.onChange({
             target: {
               name: this.props.name || '',
               value: this.getDateTime(),
diff --git a/assets/js/src/newsletters/templates.jsx b/assets/js/src/newsletters/templates.jsx
index c797beff30..b818a4957f 100644
--- a/assets/js/src/newsletters/templates.jsx
+++ b/assets/js/src/newsletters/templates.jsx
@@ -57,6 +57,7 @@ const ImportTemplate = React.createClass({
     };
 
     reader.readAsText(file);
+    return true;
   },
   render: function () {
     return (
diff --git a/assets/js/src/subscribers/form.jsx b/assets/js/src/subscribers/form.jsx
index e3e9b3ef60..422723081c 100644
--- a/assets/js/src/subscribers/form.jsx
+++ b/assets/js/src/subscribers/form.jsx
@@ -170,6 +170,7 @@ define(
           </p>
         );
       }
+      return undefined;
     };
 
     const afterFormContent = function () {