diff --git a/src/inlines.c b/src/inlines.c
index bf765eab5..f9f70e703 100644
--- a/src/inlines.c
+++ b/src/inlines.c
@@ -931,7 +931,7 @@ static cmark_node *handle_pointy_brace(subject *subj, int options) {
   // finally, try to match an html tag
   if (subj->pos + 2 <= subj->input.len) {
     int c = subj->input.data[subj->pos];
-    if (c == '!' && (subj->flags & FLAG_SKIP_HTML_COMMENT) == 0) {
+    if (c == '!') {
       c = subj->input.data[subj->pos+1];
       if (c == '-' && subj->input.data[subj->pos+2] == '-') {
 	if (subj->pos + 3 < subj->input.len &&
@@ -941,7 +941,7 @@ static cmark_node *handle_pointy_brace(subject *subj, int options) {
                    subj->input.data[subj->pos+3] == '-' &&
                    subj->input.data[subj->pos+4] == '>') {
           matchlen = 5;
-        } else {
+        } else if ((subj->flags & FLAG_SKIP_HTML_COMMENT) == 0) {
           matchlen = scan_html_comment(&subj->input, subj->pos + 1);
           if (matchlen > 0) {
             matchlen += 1; // prefix "<"
diff --git a/test/regression.txt b/test/regression.txt
index 1426617ab..c0571985d 100644
--- a/test/regression.txt
+++ b/test/regression.txt
@@ -212,6 +212,14 @@ x <!A>
 <p>x <!A></p>
 ````````````````````````````````
 
+An unclosed HTML comment must not stop later declarations and CDATA
+sections from being recognized as raw HTML.
+```````````````````````````````` example
+a <!-- x <!B> <![CDATA[y]]> c
+.
+<p>a &lt;!-- x <!B> <![CDATA[y]]> c</p>
+````````````````````````````````
+
 An underscore that is not part of a delimiter should not prevent another
 pair of underscores from forming part of their own.
 ```````````````````````````````` example