diff --git a/lib/rules/indent.js b/lib/rules/indent.js
index 79a0f25caa9..acc52463075 100644
--- a/lib/rules/indent.js
+++ b/lib/rules/indent.js
@@ -1043,7 +1043,6 @@ module.exports = {
                 offsets.ignoreToken(operator);
                 offsets.ignoreToken(tokenAfterOperator);
                 offsets.setDesiredOffset(tokenAfterOperator, operator, 0);
-                offsets.setDesiredOffsets([tokenAfterOperator.range[1], node.range[1]], tokenAfterOperator, 1);
             },
 
             "BlockStatement, ClassBody"(node) {
diff --git a/tests/lib/rules/indent.js b/tests/lib/rules/indent.js
index 6ffa72ce418..3a6bc0c9937 100644
--- a/tests/lib/rules/indent.js
+++ b/tests/lib/rules/indent.js
@@ -4694,6 +4694,15 @@ ruleTester.run("indent", rule, {
             `,
             options: [4, { ignoredNodes: ["JSXOpeningElement"] }]
         },
+        {
+            code: unIndent`
+                foo &&
+                <Bar
+                >
+                </Bar>
+            `,
+            options: [4, { ignoredNodes: ["JSXElement", "JSXOpeningElement"] }]
+        },
         {
             code: unIndent`
                 (function($) {