diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
index b79f724cba..26254a5236 100644
--- a/lib/rules/jsx-indent.js
+++ b/lib/rules/jsx-indent.js
@@ -275,6 +275,18 @@ module.exports = {
         }
         const parentNodeIndent = getNodeIndent(node.parent);
         checkNodesIndent(node, parentNodeIndent + indentSize);
+      },
+      ReturnStatement: function(node) {
+        if (!node.parent) {
+          return;
+        }
+
+        var openingIndent = getNodeIndent(node);
+        var closingIndent = getNodeIndent(node, true);
+
+        if (closingIndent !== openingIndent) {
+          report(node, openingIndent, closingIndent);
+        }
       }
     };
   }