diff --git a/src/Forms/HTMLEditor/HTMLEditorField.php b/src/Forms/HTMLEditor/HTMLEditorField.php
index db8d08a05ae..52d6f650e01 100644
--- a/src/Forms/HTMLEditor/HTMLEditorField.php
+++ b/src/Forms/HTMLEditor/HTMLEditorField.php
@@ -191,7 +191,13 @@ public function getSchemaStateDefaults()
      */
     public function ValueEntities()
     {
-        return htmlentities($this->Value() ?? '', ENT_COMPAT, 'UTF-8', false);
+        $value = htmlentities($this->Value(), ENT_COMPAT, 'UTF-8', false);
+
+        $value = preg_replace_callback('/(?:&lt;pre.*?&gt;(?<replace>.*?)&lt;\/pre&gt;)/imsu', function ($matches) {
+            return str_replace($matches['replace'], htmlentities($matches['replace'], ENT_COMPAT, 'UTF-8', true), $matches[0]);
+        }, $value);
+
+        return $value;
     }
 
     /**
diff --git a/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
index 2abe550aa5b..030fa749b26 100644
--- a/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
+++ b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
@@ -210,23 +210,34 @@ public function testReadonlyField()
         );
     }
 
-    public function testValueEntities()
+    public function provideTestValueEntities()
     {
-        $inputText = "The company &amp; partners";
-        $field = new HTMLEditorField("Content");
-        $field->setValue($inputText);
-
-        $this->assertEquals(
-            "The company &amp; partners",
-            $field->obj('ValueEntities')->forTemplate()
-        );
+        return [
+            "ampersand" => [
+                "The company &amp; partners",
+                "The company &amp; partners"
+            ],
+            "double ampersand" => [
+                "The company &amp;amp; partners",
+                "The company &amp;amp; partners"
+            ],
+            "left arrow and right arrow" => [
+                "<p><pre>&lt;strong&gt;The company and partners&lt;/strong&gt;</pre></p>",
+                "&lt;p&gt;&lt;pre&gt;&amp;lt;strong&amp;gt;The company and partners&amp;lt;/strong&amp;gt;&lt;/pre&gt;&lt;/p&gt;"
+            ],
+        ];
+    }
 
-        $inputText = "The company &amp;&amp; partners";
+    /**
+     * @dataProvider provideTestValueEntities
+     */
+    public function testValueEntities(string $input, string $result)
+    {
         $field = new HTMLEditorField("Content");
-        $field->setValue($inputText);
+        $field->setValue($input);
 
         $this->assertEquals(
-            "The company &amp;&amp; partners",
+            $result,
             $field->obj('ValueEntities')->forTemplate()
         );
     }