diff --git a/.eslintrc.json b/.eslintrc.json
index 2e121a0888e4..5559ce5b6e87 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,7 +1,6 @@
 {
     "extends": "./Tools/eslint-config-cesium/browser.js",
     "rules": {
-        "no-else-return": "error",
         "no-unused-vars": ["error", {"vars": "all", "args": "none"}]
     }
 }
diff --git a/Tools/eslint-config-cesium/CHANGES.md b/Tools/eslint-config-cesium/CHANGES.md
index 48231db74701..2e732a00435f 100644
--- a/Tools/eslint-config-cesium/CHANGES.md
+++ b/Tools/eslint-config-cesium/CHANGES.md
@@ -1,8 +1,10 @@
 Change Log
 ==========
+
 ### 2.0.0
 
-* Enable [`no-floating-decimal`](http://eslint.org/docs/rules/no-floating-decimal)
+* Enable [no-floating-decimal](http://eslint.org/docs/rules/no-floating-decimal).
+* Enable [no-else-return](http://eslint.org/docs/rules/no-else-return)
 
 ### 1.0.0 - 2017-06-12
 
diff --git a/Tools/eslint-config-cesium/index.js b/Tools/eslint-config-cesium/index.js
index 9383db082ef4..e76b428e9815 100644
--- a/Tools/eslint-config-cesium/index.js
+++ b/Tools/eslint-config-cesium/index.js
@@ -22,6 +22,7 @@ module.exports = {
         'new-cap': ['error', {properties: false}],
         'no-caller': ['error'],
         'no-console': 'off',
+        "no-else-return": "error",
         'no-empty': ['error'],
         'no-extend-native': ['error'],
         'no-extra-boolean-cast': 'off',