diff --git a/src/rules.ts b/src/rules.ts
index b480d03504..cc2e62bccf 100644
--- a/src/rules.ts
+++ b/src/rules.ts
@@ -136,7 +136,7 @@ const def = edit(/^ {0,3}\[(label)\]: *(?:\n[ \t]*)?([^<\s][^\s]*|<.*?>)(?:(?: +
   .replace('title', /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/)
   .getRegex();
 
-const list = edit(/^(bull)([ \t][^\n]+?)?(?:\n|$)/)
+const list = edit(/^(bull)([ \t][^\n]*?)?(?:\n|$)/)
   .replace(/bull/g, bullet)
   .getRegex();
 
@@ -170,7 +170,7 @@ const paragraph = edit(_paragraph)
   .replace('|table', '')
   .replace('blockquote', ' {0,3}>')
   .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
-  .replace('list', ' {0,3}(?:[*+-]|1[.)])[ \\t]') // only lists starting from 1 can interrupt
+  .replace('list', ' {0,3}(?:[*+-]|1[.)])[ \\t]+[^ \\t\\n]') // only non-empty lists starting from 1 can interrupt
   .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
   .replace('tag', _tag) // pars can be interrupted by type (6) html blocks
   .getRegex();
@@ -214,7 +214,7 @@ const gfmTable = edit(
   .replace('blockquote', ' {0,3}>')
   .replace('code', '(?: {4}| {0,3}\t)[^\\n]')
   .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
-  .replace('list', ' {0,3}(?:[*+-]|1[.)])[ \\t]') // only lists starting from 1 can interrupt
+  .replace('list', ' {0,3}(?:[*+-]|1[.)])[ \\t]') // any bullet ends the table rows
   .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
   .replace('tag', _tag) // tables can be interrupted by type (6) html blocks
   .getRegex();
@@ -230,7 +230,7 @@ const blockGfm: Record<BlockKeys, RegExp> = {
     .replace('table', gfmTable) // interrupt paragraphs with table
     .replace('blockquote', ' {0,3}>')
     .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
-    .replace('list', ' {0,3}(?:[*+-]|1[.)])[ \\t]') // only lists starting from 1 can interrupt
+    .replace('list', ' {0,3}(?:[*+-]|1[.)])[ \\t]+[^ \\t\\n]') // only non-empty lists starting from 1 can interrupt
     .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
     .replace('tag', _tag) // pars can be interrupted by type (6) html blocks
     .getRegex(),
diff --git a/test/specs/new/list_item_empty_trailing_space.html b/test/specs/new/list_item_empty_trailing_space.html
new file mode 100644
index 0000000000..6c5cd4fa7e
--- /dev/null
+++ b/test/specs/new/list_item_empty_trailing_space.html
@@ -0,0 +1,16 @@
+<ul>
+<li></li>
+</ul>
+<ul>
+<li></li>
+</ul>
+<ol>
+<li></li>
+</ol>
+<ol>
+<li></li>
+</ol>
+<p>foo
++</p>
+<p>bar
+1.</p>
diff --git a/test/specs/new/list_item_empty_trailing_space.md b/test/specs/new/list_item_empty_trailing_space.md
new file mode 100644
index 0000000000..778c083162
--- /dev/null
+++ b/test/specs/new/list_item_empty_trailing_space.md
@@ -0,0 +1,13 @@
+- 
+
+* 
+
+1. 
+
+1) 
+
+foo
++ 
+
+bar
+1.