diff --git a/application/Espo/Core/Htmlizer/Factory.php b/application/Espo/Core/Htmlizer/Factory.php
new file mode 100644
index 0000000000..5429661edd
--- /dev/null
+++ b/application/Espo/Core/Htmlizer/Factory.php
@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Htmlizer;
+
+use Espo\Core\Container;
+
+class Factory
+{
+    protected $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    public function create(bool $skipAcl = false)
+    {
+        return new Htmlizer(
+            $this->container->get('fileManager'),
+            $this->container->get('dateTime'),
+            $this->container->get('number'),
+            !$skipAcl ? $this->container->get('acl') : null,
+            $this->container->get('entityManager'),
+            $this->container->get('metadata'),
+            $this->container->get('defaultLanguage'),
+            $this->container->get('config'),
+            $this->container->get('serviceFactory')
+        );
+    }
+}
diff --git a/application/Espo/Core/Htmlizer/Htmlizer.php b/application/Espo/Core/Htmlizer/Htmlizer.php
index f4a3b4d934..c6dc4bd817 100644
--- a/application/Espo/Core/Htmlizer/Htmlizer.php
+++ b/application/Espo/Core/Htmlizer/Htmlizer.php
@@ -39,7 +39,7 @@ use Espo\Core\Utils\Config;
 use Espo\Core\Utils\Language;
 use Espo\Core\Utils\Metadata;
 use Espo\ORM\EntityManager;
-use Espo\Core\serviceFactory;
+use Espo\Core\ServiceFactory;
 
 use LightnCandy\LightnCandy as LightnCandy;
 
diff --git a/application/Espo/Core/Loaders/HtmlizerFactory.php b/application/Espo/Core/Loaders/HtmlizerFactory.php
new file mode 100644
index 0000000000..3e80d03e98
--- /dev/null
+++ b/application/Espo/Core/Loaders/HtmlizerFactory.php
@@ -0,0 +1,40 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Loaders;
+
+class HtmlizerFactory extends Base
+{
+    public function load()
+    {
+        return new \Espo\Core\Htmlizer\Factory(
+            $this->getContainer()
+        );
+    }
+}
diff --git a/application/Espo/Services/Pdf.php b/application/Espo/Services/Pdf.php
index ec07f550f2..ffb1c7cb76 100644
--- a/application/Espo/Services/Pdf.php
+++ b/application/Espo/Services/Pdf.php
@@ -47,14 +47,13 @@ class Pdf extends \Espo\Core\Services\Base
 
     protected function init()
     {
-        $this->addDependency('fileManager');
         $this->addDependency('acl');
         $this->addDependency('metadata');
         $this->addDependency('serviceFactory');
-        $this->addDependency('dateTime');
-        $this->addDependency('number');
         $this->addDependency('entityManager');
         $this->addDependency('defaultLanguage');
+
+        $this->addDependency('htmlizerFactory');
     }
 
     protected function getAcl()
@@ -72,11 +71,6 @@ class Pdf extends \Espo\Core\Services\Base
         return $this->getInjection('serviceFactory');
     }
 
-    protected function getFileManager()
-    {
-        return $this->getInjection('fileManager');
-    }
-
     protected function printEntity(Entity $entity, Entity $template, Htmlizer $htmlizer, \Espo\Core\Pdf\Tcpdf $pdf,
         ?array $additionalData = null)
     {
@@ -308,16 +302,6 @@ class Pdf extends \Espo\Core\Services\Base
 
     protected function createHtmlizer()
     {
-        return new Htmlizer(
-            $this->getFileManager(),
-            $this->getInjection('dateTime'),
-            $this->getInjection('number'),
-            $this->getAcl(),
-            $this->getInjection('entityManager'),
-            $this->getInjection('metadata'),
-            $this->getInjection('defaultLanguage'),
-            $this->getInjection('config'),
-            $this->getInjection('serviceFactory')
-        );
+        return $this->getInjection('htmlizerFactory')->create();
     }
 }