diff --git a/src/parser/statement.js b/src/parser/statement.js
index c81550143f..ab7ae36f1c 100644
--- a/src/parser/statement.js
+++ b/src/parser/statement.js
@@ -748,7 +748,7 @@ pp.parseClassProperty = function (node) {
     node.value = null;
   }
   if (!this.eat(tt.semi)) {
-    this.raise(node.value && node.value.end || node.key.end, "A semicolon is required after a class property");
+    this.raise(this.state.start, "A semicolon is required after a class property");
   }
   return this.finishNode(node, "ClassProperty");
 };
diff --git a/test/fixtures/experimental/class-properties/semicolons-required-with-value/options.json b/test/fixtures/experimental/class-properties/semicolons-required-with-value/options.json
index b8d8f0380c..4bf955cfec 100644
--- a/test/fixtures/experimental/class-properties/semicolons-required-with-value/options.json
+++ b/test/fixtures/experimental/class-properties/semicolons-required-with-value/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "A semicolon is required after a class property (2:10)",
+  "throws": "A semicolon is required after a class property (3:0)",
   "plugins": ["classProperties"]
 }
diff --git a/test/fixtures/experimental/class-properties/semicolons-required-without-value/options.json b/test/fixtures/experimental/class-properties/semicolons-required-without-value/options.json
index 29c4aac831..4bf955cfec 100644
--- a/test/fixtures/experimental/class-properties/semicolons-required-without-value/options.json
+++ b/test/fixtures/experimental/class-properties/semicolons-required-without-value/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "A semicolon is required after a class property (2:6)",
+  "throws": "A semicolon is required after a class property (3:0)",
   "plugins": ["classProperties"]
 }