diff --git a/.eslintrc.yml b/.eslintrc.yml
index c7ec5c228a..f5ce779d44 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -61,9 +61,11 @@ rules:
   no-floating-decimal: ["error"]
   no-multi-spaces: ["error"]
   no-multiple-empty-lines: ["error", { "max": 1 }]
-  no-redeclare: ["warn"]
   no-trailing-spaces: ["error"]
+  one-var: ["error", "never"]
+  semi: ["warn"]
+  space-before-blocks: ["error"]
+  # TODO: Fix warnings and remove these rules
+  no-redeclare: ["warn"]
   no-unused-vars: ["warn"]
   no-useless-escape: ["warn"]
-  one-var: ["error", "never"]
-  space-before-blocks: ["error"]