diff --git a/lib/rules/jsx-curly-spacing.js b/lib/rules/jsx-curly-spacing.js
index d9db3c2fb3..9aaa4d3520 100644
--- a/lib/rules/jsx-curly-spacing.js
+++ b/lib/rules/jsx-curly-spacing.js
@@ -228,6 +228,13 @@ module.exports = {
         message: `There should be no space after '${token.value}'`,
         fix: function(fixer) {
           const nextToken = sourceCode.getTokenAfter(token);
+          const nextComment = sourceCode.getCommentsAfter(token);
+
+          // Take comments into consideration to narrow the fix range to what is actually affected. (See #1414)
+          if (nextComment.length > 0) {
+            return fixByTrimmingWhitespace(fixer, token.range[1], Math.min(nextToken.range[0], nextComment[0].start), 'start');
+          }
+
           return fixByTrimmingWhitespace(fixer, token.range[1], nextToken.range[0], 'start');
         }
       });
@@ -246,6 +253,13 @@ module.exports = {
         message: `There should be no space before '${token.value}'`,
         fix: function(fixer) {
           const previousToken = sourceCode.getTokenBefore(token);
+          const previousComment = sourceCode.getCommentsBefore(token);
+
+          // Take comments into consideration to narrow the fix range to what is actually affected. (See #1414)
+          if (previousComment.length > 0) {
+            return fixByTrimmingWhitespace(fixer, Math.max(previousToken.range[1], previousComment[0].end), token.range[0], 'end');
+          }
+
           return fixByTrimmingWhitespace(fixer, previousToken.range[1], token.range[0], 'end');
         }
       });
diff --git a/tests/lib/rules/jsx-curly-spacing.js b/tests/lib/rules/jsx-curly-spacing.js
index d42ce7b0fd..18078f9538 100644
--- a/tests/lib/rules/jsx-curly-spacing.js
+++ b/tests/lib/rules/jsx-curly-spacing.js
@@ -59,9 +59,9 @@ ruleTester.run('jsx-curly-spacing', rule, {
       '</App>;'
     ].join('\n')
   }, {
-    code: '<App>{ foo /* comment */ }</App>'
+    code: '<App>{ foo /* comment 1 */ }</App>'
   }, {
-    code: '<App>{ /* comment */ foo }</App>'
+    code: '<App>{ /* comment 1 */ foo }</App>'
   }, {
     code: '<App foo={bar} />;',
     options: [{attributes: true}]
@@ -264,7 +264,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: [{attributes: {when: 'never', allowMultiline: true}}]
   }, {
-    code: '<App foo={bar/* comment */} />;',
+    code: '<App foo={bar/* comment 2 */} />;',
     options: [{attributes: {when: 'never'}}]
   }, {
     code: '<App foo={ bar } />;',
@@ -345,11 +345,11 @@ ruleTester.run('jsx-curly-spacing', rule, {
     options: [{children: {when: 'never', allowMultiline: true}}]
   }, {
     code: [
-      '<App>{/* comment */}</App>;'
+      '<App>{/* comment 3 */}</App>;'
     ].join('\n'),
     options: [{children: {when: 'never'}}]
   }, {
-    code: '<App>{bar/* comment */}</App>;',
+    code: '<App>{bar/* comment 4 */}</App>;',
     options: [{children: {when: 'never'}}]
   }, {
     code: '<App>{ bar }</App>;',
@@ -411,7 +411,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: [{attributes: {when: 'never', allowMultiline: true}}]
   }, {
-    code: '<App {...bar/* comment */} />;',
+    code: '<App {...bar/* comment 5 */} />;',
     options: [{attributes: {when: 'never'}}]
   }, {
     code: '<App foo={bar} {...baz} />;'
@@ -440,13 +440,13 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: [{attributes: {when: 'always'}}]
   }, {
-    code: '<App foo={bar/* comment */} {...baz/* comment */} />;',
+    code: '<App foo={bar/* comment 6 */} {...baz/* comment 7 */} />;',
     options: [{attributes: {when: 'never'}}]
   }, {
     code: '<App foo={3} bar={ {a: 2} } />',
     options: [{attributes: {when: 'never', spacing: {objectLiterals: 'always'}}}]
   }, {
-    code: '<App>{bar/* comment */}</App>;',
+    code: '<App>{bar/* comment 8 */}</App>;',
     options: [{children: {when: 'never'}}]
   }, {
     code: '<App>{bar} {baz}</App>;'
@@ -475,7 +475,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: [{children: {when: 'always'}}]
   }, {
-    code: '<App>{bar/* comment */} {baz/* comment */}</App>;',
+    code: '<App>{bar/* comment 9 */} {baz/* comment 10 */}</App>;',
     options: [{children: {when: 'never'}}]
   }, {
     code: '<App>{3} { {a: 2} }</App>',
@@ -572,11 +572,11 @@ ruleTester.run('jsx-curly-spacing', rule, {
     options: ['never']
   }, {
     code: [
-      '<App>{/* comment */}</App>;'
+      '<App>{/* comment 11 */}</App>;'
     ].join('\n'),
     options: ['never']
   }, {
-    code: '<App foo={bar/* comment */} />;',
+    code: '<App foo={bar/* comment 12 */} />;',
     options: ['never']
   }, {
     code: '<App foo={ bar } />;',
@@ -636,7 +636,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: ['never']
   }, {
-    code: '<App {...bar/* comment */} />;',
+    code: '<App {...bar/* comment 13 */} />;',
     options: ['never']
   }, {
     code: '<App foo={bar} {...baz} />;',
@@ -663,7 +663,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
     ].join('\n'),
     options: ['always']
   }, {
-    code: '<App foo={bar/* comment */} {...baz/* comment */} />;',
+    code: '<App foo={bar/* comment 14 */} {...baz/* comment 15 */} />;',
     options: ['never']
   }, {
     code: '<App foo={3} bar={ {a: 2} } />',
@@ -1514,16 +1514,16 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App foo={ foo /* comment */ } />',
-    output: '<App foo={foo /* comment */} />',
+    code: '<App foo={ foo /* comment 16 */ } />',
+    output: '<App foo={foo /* comment 16 */} />',
     errors: [{
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
     }]
   }, {
-    code: '<App foo={foo /* comment */} />',
-    output: '<App foo={ foo /* comment */ } />',
+    code: '<App foo={foo /* comment 17 */} />',
+    output: '<App foo={ foo /* comment 17 */ } />',
     options: [{attributes: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -1531,16 +1531,16 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App foo={ /* comment */ foo } />',
-    output: '<App foo={/* comment */ foo} />',
+    code: '<App foo={ /* comment 18 */ foo } />',
+    output: '<App foo={/* comment 18 */ foo} />',
     errors: [{
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
     }]
   }, {
-    code: '<App foo={/* comment */ foo} />',
-    output: '<App foo={ /* comment */ foo } />',
+    code: '<App foo={/* comment 19 */ foo} />',
+    output: '<App foo={ /* comment 19 */ foo } />',
     options: [{attributes: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -1687,8 +1687,8 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App>{foo /* comment */}</App>',
-    output: '<App>{ foo /* comment */ }</App>',
+    code: '<App>{foo /* comment 20 */}</App>',
+    output: '<App>{ foo /* comment 20 */ }</App>',
     options: [{children: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -1696,8 +1696,8 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App>{/* comment */ foo}</App>',
-    output: '<App>{ /* comment */ foo }</App>',
+    code: '<App>{/* comment 21 */ foo}</App>',
+    output: '<App>{ /* comment 21 */ foo }</App>',
     options: [{children: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -2108,8 +2108,8 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App foo={foo /* comment */} />',
-    output: '<App foo={ foo /* comment */ } />',
+    code: '<App foo={foo /* comment 22 */} />',
+    output: '<App foo={ foo /* comment 22 */ } />',
     options: ['always'],
     errors: [{
       message: 'A space is required after \'{\''
@@ -2117,8 +2117,8 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App foo={/* comment */ foo} />',
-    output: '<App foo={ /* comment */ foo } />',
+    code: '<App foo={/* comment 23 */ foo} />',
+    output: '<App foo={ /* comment 23 */ foo } />',
     options: ['always'],
     errors: [{
       message: 'A space is required after \'{\''
@@ -2126,22 +2126,22 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }]
   }, {
-    code: '<App>{/*comment*/ }</App>',
-    output: '<App>{/*comment*/}</App>',
+    code: '<App>{/*comment24*/ }</App>',
+    output: '<App>{/*comment24*/}</App>',
     options: [{children: {when: 'never'}}],
     errors: [{
       message: 'There should be no space before \'}\''
     }]
   }, {
-    code: '<App>{ /*comment*/}</App>',
-    output: '<App>{/*comment*/}</App>',
+    code: '<App>{ /*comment25*/}</App>',
+    output: '<App>{/*comment25*/}</App>',
     options: [{children: {when: 'never'}}],
     errors: [{
       message: 'There should be no space after \'{\''
     }]
   }, {
-    code: '<App>{/*comment*/}</App>',
-    output: '<App>{ /*comment*/ }</App>',
+    code: '<App>{/*comment26*/}</App>',
+    output: '<App>{ /*comment26*/ }</App>',
     options: [{children: {when: 'always'}}],
     errors: [{
       message: 'A space is required after \'{\''
@@ -2151,13 +2151,47 @@ ruleTester.run('jsx-curly-spacing', rule, {
   }, {
     code: [
       '<App>',
-      '{/*comment*/',
+      '{ /* comment 27 */ }',
+      '</App>;'
+    ].join('\n'),
+    output: [
+      '<App>',
+      '{/* comment 27 */}',
+      '</App>;'
+    ].join('\n'),
+    options: [{when: 'never', children: true}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
+  }, {
+    code: [
+      '<App>',
+      '{/* comment 28 */}',
+      '</App>;'
+    ].join('\n'),
+    output: [
+      '<App>',
+      '{ /* comment 28 */ }',
+      '</App>;'
+    ].join('\n'),
+    options: [{when: 'always', children: true}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }]
+  }, {
+    code: [
+      '<App>',
+      '{/*comment29*/',
       '}',
       '</App>'
     ].join('\n'),
     output: [
       '<App>',
-      '{/*comment*/}',
+      '{/*comment29*/}',
       '</App>'
     ].join('\n'),
     options: [{children: {when: 'never', allowMultiline: false}}],
@@ -2168,17 +2202,59 @@ ruleTester.run('jsx-curly-spacing', rule, {
     code: [
       '<App>',
       '{',
-      '/*comment*/}',
+      '/*comment30*/}',
       '</App>'
     ].join('\n'),
     output: [
       '<App>',
-      '{/*comment*/}',
+      '{/*comment30*/}',
       '</App>'
     ].join('\n'),
     options: [{children: {when: 'never', allowMultiline: false}}],
     errors: [{
       message: 'There should be no newline after \'{\''
     }]
+  }, {
+    code: [
+      '<App>{ /* comment 31 */',
+      'bar',
+      '} {',
+      'baz',
+      '/* comment 32 */ }</App>;'
+    ].join('\n'),
+    output: [
+      '<App>{/* comment 31 */',
+      'bar',
+      '} {',
+      'baz',
+      '/* comment 32 */}</App>;'
+    ].join('\n'),
+    options: [{when: 'never', children: true}],
+    errors: [{
+      message: 'There should be no space after \'{\''
+    }, {
+      message: 'There should be no space before \'}\''
+    }]
+  }, {
+    code: [
+      '<App>{/* comment 33 */',
+      'bar',
+      '} {',
+      'baz',
+      '/* comment 33 */}</App>;'
+    ].join('\n'),
+    output: [
+      '<App>{ /* comment 33 */',
+      'bar',
+      '} {',
+      'baz',
+      '/* comment 33 */ }</App>;'
+    ].join('\n'),
+    options: [{when: 'always', children: true}],
+    errors: [{
+      message: 'A space is required after \'{\''
+    }, {
+      message: 'A space is required before \'}\''
+    }]
   }]
 });