diff --git a/src/ChrisKonnertz/BBCode/BBCode.php b/src/ChrisKonnertz/BBCode/BBCode.php
index 975d007..73099a3 100644
--- a/src/ChrisKonnertz/BBCode/BBCode.php
+++ b/src/ChrisKonnertz/BBCode/BBCode.php
@@ -408,7 +408,7 @@ protected function generateTag(Tag $tag, &$html, Tag $openingTag = null, array $
                     if (isset($openTags['list']) and sizeof($openTags['list']) > 0) {
                         $tag->opening = false;
 
-                        if ($this->endsWith($html, '<ul>')) {
+                        if ($this->endsWith($html, '<ul>') || $this->endsWith($html, '<ol>')) {
                             $code = '<li>';
                         } else {
                             $code = '</li><li>';