diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
index 8b8394ee9e..e8e0cab14f 100644
--- a/lib/rules/jsx-indent.js
+++ b/lib/rules/jsx-indent.js
@@ -159,6 +159,18 @@ module.exports = function(context) {
       }
       var peerElementIndent = getNodeIndent(node.parent.openingElement);
       checkNodesIndent(node, peerElementIndent);
+    },
+    ReturnStatement: function(node) {
+      if (!node.parent) {
+        return;
+      }
+
+      var openingIndent = getNodeIndent(node);
+      var closingIndent = getNodeIndent(node, true);
+
+      if (closingIndent !== openingIndent) {
+        report(node, openingIndent, closingIndent);
+      }
     }
   };