diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index 4d9e66fca..c8c697d56 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -43,8 +43,8 @@ class Token(NamedTuple):
 
 _rules: list[tuple[str | None, re.Pattern[str]]] = [
     (None, re.compile(r'\s+', re.UNICODE)),
-    (None, re.compile(r'<!--.*')),
-    ('linecomment', re.compile(r'//.*')),
+    (None, re.compile(r'<!--[^\r\n]*')),
+    ('linecomment', re.compile(r'//[^\r\n]*')),
     ('multilinecomment', re.compile(r'/\*.*?\*/', re.UNICODE | re.DOTALL)),
     ('dotted_name', dotted_name_re),
     ('name', name_re),
diff --git a/tests/messages/test_js_extract.py b/tests/messages/test_js_extract.py
index af6dfb144..cb3e8eca3 100644
--- a/tests/messages/test_js_extract.py
+++ b/tests/messages/test_js_extract.py
@@ -41,14 +41,16 @@ def test_various_calls():
     ]
 
 
-def test_message_with_line_comment():
-    buf = BytesIO("""\
-// NOTE: hello
-msg = _('Bonjour à tous')
-""".encode('utf-8'))
+@pytest.mark.parametrize('newline', ['\n', '\r\n'])
+def test_message_with_line_comment(newline):
+    buf = BytesIO(newline.join([
+        "<!-- ignored",
+        "// NOTE: hello",
+        "msg = _('Bonjour à tous')",
+        "",
+    ]).encode('utf-8'))
     messages = list(extract.extract_javascript(buf, ('_',), ['NOTE:'], {}))
-    assert messages[0][2] == 'Bonjour à tous'
-    assert messages[0][3] == ['NOTE: hello']
+    assert messages == [(3, '_', 'Bonjour à tous', ['NOTE: hello'])]
 
 
 def test_message_with_multiline_comment():