diff --git a/lib/rules/html-self-closing.js b/lib/rules/html-self-closing.js
index 5b98d8cf7..c31c9ab70 100644
--- a/lib/rules/html-self-closing.js
+++ b/lib/rules/html-self-closing.js
@@ -150,8 +150,7 @@ module.exports = {
             isEmpty(node, sourceCode)
           ) {
             context.report({
-              node,
-              loc: node.loc,
+              node: node.endTag || node,
               messageId: 'requireSelfClosing',
               data: {
                 elementType: ELEMENT_TYPE_MESSAGES[elementType],
@@ -175,7 +174,13 @@ module.exports = {
           if (mode === 'never' && node.startTag.selfClosing) {
             context.report({
               node,
-              loc: node.loc,
+              loc: {
+                start: {
+                  line: node.loc.end.line,
+                  column: node.loc.end.column - 2
+                },
+                end: node.loc.end
+              },
               messageId: 'disallowSelfClosing',
               data: {
                 elementType: ELEMENT_TYPE_MESSAGES[elementType],