diff --git a/lib/rules/no-empty.js b/lib/rules/no-empty.js
index 2a5625a3fbf..c7342635df7 100644
--- a/lib/rules/no-empty.js
+++ b/lib/rules/no-empty.js
@@ -53,7 +53,6 @@ module.exports = {
 
         return {
             BlockStatement(node) {
-
                 const range = [node.range[0] + 1, node.range[1] - 1];
 
                 // if the body is not empty, we can just return immediately
@@ -92,8 +91,9 @@ module.exports = {
             },
 
             SwitchStatement(node) {
-
-                const range = [node.range[0] + 1, node.range[1] - 1];
+                const closingCurly = sourceCode.getLastToken(node);
+                const openingCurly = sourceCode.getTokenBefore(node.cases.length ? node.cases[0] : closingCurly);
+                const range = [openingCurly.range[0] + 1, closingCurly.range[1] - 1];
 
                 if (typeof node.cases === "undefined" || node.cases.length === 0) {
                     context.report({
@@ -103,7 +103,7 @@ module.exports = {
                         suggest: [
                             {
                                 messageId: "suggestComment",
-                                data: { type: "block" },
+                                data: { type: "switch" },
                                 fix(fixer) {
                                     return fixer.replaceTextRange(range, " /* empty */ ");
                                 }