diff --git a/.eslintrc.yml b/.eslintrc.yml
index 8893708a73..b7e09e2295 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -21,7 +21,6 @@ plugins:
 root: true
 
 rules:
-  consistent-return: off # TODO: remove, and default to mozilla/recommended of "error"
   no-console: [error, {allow: [debug, error, info, trace, warn]}]
   no-var: off # TODO: change to "error"
   prefer-const: off # TODO: change to "error"
diff --git a/addon/bootstrap.js b/addon/bootstrap.js
index a4f42f5057..18fcd7dd53 100644
--- a/addon/bootstrap.js
+++ b/addon/bootstrap.js
@@ -171,9 +171,9 @@ function handleStartup() {
   });
 
   if (!shouldDisable() && !webExtension.started) {
-    return start(webExtension);
+    start(webExtension);
   } else if (shouldDisable()) {
-    return stop(webExtension, ADDON_DISABLE);
+    stop(webExtension, ADDON_DISABLE);
   }
 }
 
diff --git a/addon/webextension/background/auth.js b/addon/webextension/background/auth.js
index ecef80a8e1..fda6aeaa94 100644
--- a/addon/webextension/background/auth.js
+++ b/addon/webextension/background/auth.js
@@ -21,7 +21,7 @@ this.auth = (function() {
     } else {
       registrationInfo = generateRegistrationInfo();
       log.info("Generating new device authentication ID", registrationInfo);
-      return browser.storage.local.set({registrationInfo});
+      browser.storage.local.set({registrationInfo});
     }
   }));
 
diff --git a/addon/webextension/background/communication.js b/addon/webextension/background/communication.js
index f1184fb8f2..1737613e1c 100644
--- a/addon/webextension/background/communication.js
+++ b/addon/webextension/background/communication.js
@@ -36,7 +36,7 @@ this.communication = (function() {
         log.error(`Promise error in ${req.funcName}:`, errorResult, errorResult && errorResult.stack);
         sendResponse({type: "error", message: errorResult + "", errorCode: errorResult.errorCode, popupMessage: errorResult.popupMessage});
       });
-      return true;
+      return;
     }
     sendResponse({type: "success", value: result});
   });
diff --git a/addon/webextension/background/main.js b/addon/webextension/background/main.js
index b8752ed50a..b5155b595c 100644
--- a/addon/webextension/background/main.js
+++ b/addon/webextension/background/main.js
@@ -203,6 +203,7 @@ this.main = (function() {
         message: browser.i18n.getMessage("notificationLinkCopiedDetails", pasteSymbol)
       });
     }
+    return null;
   });
 
   communication.register("copyShotToClipboard", (sender, blob) => {
diff --git a/server/src/middleware/csrf.js b/server/src/middleware/csrf.js
index bd93b763ce..659fa996bb 100644
--- a/server/src/middleware/csrf.js
+++ b/server/src/middleware/csrf.js
@@ -65,7 +65,8 @@ exports.csrfProtection = function(req, res, next) {
     let exc = new Error("Duplicate CSRF cookies");
     exc.headerValue = rawCookies;
     captureRavenException(exc, req);
-    return simpleResponse(res, "Bad request", 400);
+    simpleResponse(res, "Bad request", 400);
+    return
   }
   req.cookies._csrf = req.cookies.get("_csrf"); // csurf expects a property
 
diff --git a/server/src/pages/metrics/server.js b/server/src/pages/metrics/server.js
index 9afb2b56d4..f451b13db3 100644
--- a/server/src/pages/metrics/server.js
+++ b/server/src/pages/metrics/server.js
@@ -24,6 +24,7 @@ function safeStoreQueries() {
         mozlog.info("updated-metrics", {msg: "Updated metrics"});
       });
     }
+    return null;
   }).catch((error) => {
     mozlog.error("metrics-update-error", {msg: "Error running metrics queries", error});
     captureRavenException(error);
diff --git a/server/src/pages/shot/editor.js b/server/src/pages/shot/editor.js
index 5d87e795da..dc34c43e5a 100644
--- a/server/src/pages/shot/editor.js
+++ b/server/src/pages/shot/editor.js
@@ -529,7 +529,7 @@ exports.Editor = class Editor extends React.Component {
 
   draw(e) {
     if (e.buttons !== 1) {
-      return null;
+      return;
     }
     this.drawContext.beginPath();
 
diff --git a/server/src/reactruntime.js b/server/src/reactruntime.js
index 9c8f64afe0..4659afc788 100644
--- a/server/src/reactruntime.js
+++ b/server/src/reactruntime.js
@@ -153,10 +153,10 @@ exports.Page = class Page {
     }
 
     if (model.userLocales && model.userLocales.length && !model.messages) {
-      return tryGetL10nMessages(model.userLocales);
+      tryGetL10nMessages(model.userLocales);
+    } else {
+      renderBody();
     }
-
-    renderBody();
   }
 
   get dir() {
diff --git a/server/src/server.js b/server/src/server.js
index 8ba039d0a3..4430d93d47 100644
--- a/server/src/server.js
+++ b/server/src/server.js
@@ -827,7 +827,7 @@ app.post("/api/set-title/:id/:domain", function(req, res) {
   Shot.get(req.backend, shotId, req.deviceId, req.accountId).then((shot) => {
     if (!shot) {
       simpleResponse(res, "No such shot", 404);
-      return;
+      return null;
     }
     shot.userTitle = userTitle;
     return shot.update();
@@ -862,7 +862,7 @@ app.post("/api/save-edit", function(req, res) {
     if (!shot) {
       sendRavenMessage(req, "Attempt to edit shot that does not exist");
       simpleResponse(res, "No such shot", 404);
-      return;
+      return null;
     }
     let name = shot.clipNames()[0];
     shot.getClip(name).image.url = url;
diff --git a/server/src/servershot.js b/server/src/servershot.js
index 77accd63ec..7721aace23 100644
--- a/server/src/servershot.js
+++ b/server/src/servershot.js
@@ -949,7 +949,7 @@ Shot.upgradeSearch = function() {
     `,
     [SEARCHABLE_VERSION, batchSize]).then((rows) => {
       if (!rows.length) {
-        return;
+        return null;
       }
       let index = 0;
       return new Promise((resolve, reject) => {
@@ -960,13 +960,14 @@ Shot.upgradeSearch = function() {
           Shot.get("upgrade_search_only", rows[index].id).then((shot) => {
             // This shouldn't really happen, but apparently can...
             if (!shot) {
-              return;
+              return null;
             }
             return shot.upgradeSearch();
           }).then(() => {
             index++;
             run();
           }).catch(reject);
+          return null;
         }
         run();
       }).then(() => {
diff --git a/server/src/share-buttons.js b/server/src/share-buttons.js
index ece1bfb64d..fbca6420f1 100644
--- a/server/src/share-buttons.js
+++ b/server/src/share-buttons.js
@@ -99,6 +99,7 @@ class ShareButtonPanel extends React.Component {
     }
 
     this.props.closePanel();
+    return null;
   }
 
   onClickCopyButton(e) {
diff --git a/server/src/users.js b/server/src/users.js
index 013e33db39..28de6a31ee 100644
--- a/server/src/users.js
+++ b/server/src/users.js
@@ -245,5 +245,6 @@ exports.retrieveAccount = function(deviceId) {
     if (rows[0].accountid) {
       return rows[0].accountid;
     }
+    return null;
   });
 }
diff --git a/test/test.js b/test/test.js
index b8f12b5f9e..2f216adb96 100644
--- a/test/test.js
+++ b/test/test.js
@@ -223,6 +223,7 @@ describe("Test Screenshots", function() {
       return driver.quit();
     }
     console.info("Note: leaving browser open");
+    return null;
   });
 
   it("should find the add-on button", function() {