diff --git a/lib/API/JSON/v1/Forms.php b/lib/API/JSON/v1/Forms.php
index 44dbbab572..3ffadb5fc2 100644
--- a/lib/API/JSON/v1/Forms.php
+++ b/lib/API/JSON/v1/Forms.php
@@ -28,6 +28,9 @@ class Forms extends APIEndpoint {
   /** @var UserFlagsController */
   private $userFlags;
 
+  /** @var FormRenderer */
+  private $formRenderer;
+
   public $permissions = [
     'global' => AccessControl::PERMISSION_MANAGE_FORMS,
   ];
@@ -36,12 +39,14 @@ class Forms extends APIEndpoint {
     Listing\BulkActionController $bulkAction,
     Listing\Handler $listingHandler,
     Util\Styles $formStylesUtils,
-    UserFlagsController $userFlags
+    UserFlagsController $userFlags,
+    FormRenderer $formRenderer
   ) {
     $this->bulkAction = $bulkAction;
     $this->listingHandler = $listingHandler;
     $this->formStylesUtils = $formStylesUtils;
     $this->userFlags = $userFlags;
+    $this->formRenderer = $formRenderer;
   }
 
   public function get($data = []) {
@@ -130,7 +135,7 @@ class Forms extends APIEndpoint {
 
   public function previewEditor($data = []) {
     // html
-    $html = FormRenderer::renderHTML($data);
+    $html = $this->formRenderer->renderHTML($data);
 
     // convert shortcodes
     $html = WPFunctions::get()->doShortcode($html);
diff --git a/lib/Form/Renderer.php b/lib/Form/Renderer.php
index 85a5d91721..34c752092b 100644
--- a/lib/Form/Renderer.php
+++ b/lib/Form/Renderer.php
@@ -18,7 +18,7 @@ class Renderer {
     return $html;
   }
 
-  public static function renderHTML($form = []) {
+  public function renderHTML($form = []) {
     if (isset($form['body']) && !empty($form['body'])) {
       return static::renderBlocks($form['body']);
     }
diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php
index 4b7f9ebfc2..105f459006 100644
--- a/lib/Form/Widget.php
+++ b/lib/Form/Widget.php
@@ -219,7 +219,7 @@ class Widget extends \WP_Widget {
         'form' => $form,
         'title' => $title,
         'styles' => $this->formRenderer->renderStyles($form, '#' . $formId),
-        'html' => FormRenderer::renderHTML($form),
+        'html' => $this->formRenderer->renderHTML($form),
         'before_widget' => $beforeWidget,
         'after_widget' => $afterWidget,
         'before_title' => $beforeTitle,