diff --git a/application/Espo/Core/Htmlizer/Htmlizer.php b/application/Espo/Core/Htmlizer/Htmlizer.php
index a5dd8641a4..9c8fd3a3b5 100644
--- a/application/Espo/Core/Htmlizer/Htmlizer.php
+++ b/application/Espo/Core/Htmlizer/Htmlizer.php
@@ -919,6 +919,11 @@ class Htmlizer
 
         $newTemplate = str_replace('</iteration-wrapper>', '{{/each}}', $newTemplate);
 
+        $from = strpos($newTemplate,'<body>') + 6;
+        $to = strrpos($newTemplate, '</body>') - strlen($newTemplate);
+
+        $newTemplate = substr($newTemplate, $from, $to);
+
         return preg_replace('/<iteration-wrapper v="{{(.*)}}">/', '{{#each $1}}', $newTemplate) ?? '';
     }
 
diff --git a/tests/unit/Espo/Core/Htmlizer/HtmlizerTest.php b/tests/unit/Espo/Core/Htmlizer/HtmlizerTest.php
index 38c3f00197..eb0e6f2f8b 100644
--- a/tests/unit/Espo/Core/Htmlizer/HtmlizerTest.php
+++ b/tests/unit/Espo/Core/Htmlizer/HtmlizerTest.php
@@ -223,4 +223,22 @@ class HtmlizerTest extends TestCase
         $html = $this->htmlizer->render($entity, $template);
         $this->assertEquals('test', $html);
     }
+
+    public function testIterate(): void
+    {
+        /** @noinspection HtmlUnknownAttribute */
+        $template = "<ul><li iterate=\"{{items}}\">{{name}}</li></ul>";
+
+        $html = $this->htmlizer->render(null, $template, null, [
+            'items' => [
+                ['name' => '1'],
+                ['name' => '2'],
+            ],
+        ]);
+
+        /** @noinspection HtmlUnknownAttribute */
+        $expected = "<ul><li>1</li><li>2</li></ul>";
+
+        $this->assertEquals($expected, $html);
+    }
 }
