diff --git a/.eslintrc b/.eslintrc
index 8d75edc0d8..795a204d27 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -236,6 +236,7 @@
     "react/prop-types": 2,
     "react/react-in-jsx-scope": 1,
     "react/self-closing-comp": 1,
-    "react/wrap-multilines": 1
+    "react/wrap-multilines": 1,
+    "react/jsx-closing-bracket-location": [ 1, { "selfClosing": "line-aligned", "nonEmpty": "props-aligned" } ]
   }
 }