diff --git a/.eslintrc.js b/.eslintrc.js
index 14b67b2..c2ca68b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -16,16 +16,17 @@ module.exports = {
     plugins: ["@typescript-eslint"],
     rules: {
         // TODO: Remove warn rules when not needed anymore
-        "no-self-assign": "off",
-        "semi": "warn",
         "@typescript-eslint/no-empty-interface": "off",
         "@typescript-eslint/no-explicit-any": "off",
+        "indent": ["warn", 4, { "SwitchCase": 1 }],
+        "newline-before-return": "error",
+        "no-multiple-empty-lines": ["error", { max: 2, maxEOF: 0 }],
+        "no-self-assign": "off",
         "no-trailing-spaces": "warn",
+        "object-curly-spacing": ["warn", "always"],
         "prefer-template": "warn",
         "quotes": ["warn", "double", { "avoidEscape": true, "allowTemplateLiterals": true }],
-        "no-multiple-empty-lines": ["error", { max: 2, maxEOF: 0 }],
-        "indent": ["warn", 4, { "SwitchCase": 1 }],
-        "object-curly-spacing": ["warn", "always"],
         "require-await": "warn",
+        "semi": "warn",
     },
 };