diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
index 773e979de1..f6ed3ac5a1 100644
--- a/lib/rules/jsx-indent.js
+++ b/lib/rules/jsx-indent.js
@@ -325,7 +325,7 @@ module.exports = {
         checkNodesIndent(node, parentNodeIndent + indentSize);
       },
       Literal: function(node) {
-        if (!node.parent || node.parent.type !== 'JSXElement') {
+        if (!node.parent || node.parent.type !== 'JSXElement' || node.loc.start.line === node.parent.loc.start.line) {
           return;
         }
         var parentElementIndent = getOpeningElementIndent(node.parent.openingElement);
diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
index 737fdf45b2..960a1009c0 100644
--- a/tests/lib/rules/jsx-indent.js
+++ b/tests/lib/rules/jsx-indent.js
@@ -451,6 +451,14 @@ ruleTester.run('jsx-indent', rule, {
     ].join('\n'),
     options: [2],
     parserOptions: parserOptions
+  }, {
+    code: [
+      'function foo() {',
+      '  <span>Text</span>',
+      '}'
+    ].join('\n'),
+    options: [2],
+    parserOptions: parserOptions
   }],
 
   invalid: [{