diff --git a/assets/js/src/form_editor/components/preview.jsx b/assets/js/src/form_editor/components/preview.jsx
index a6b068130d..12b694dc41 100644
--- a/assets/js/src/form_editor/components/preview.jsx
+++ b/assets/js/src/form_editor/components/preview.jsx
@@ -10,6 +10,7 @@ import { useDispatch, useSelect } from '@wordpress/data';
 import Preview from '../../common/preview/preview.jsx';
 import Modal from '../../common/modal/modal.jsx';
 import { blocksToFormBodyFactory } from '../store/blocks_to_form_body.jsx';
+import mapFormDataBeforeSaving from '../store/map_form_data_before_saving.jsx';
 import { onChange } from '../../common/functions';
 
 function getFormType(settings) {
@@ -30,8 +31,9 @@ function getFormType(settings) {
 }
 
 const getPreviewType = () => (window.localStorage.getItem('mailpoet_form_preview_last_preview_type') || 'desktop');
+
 const FormPreview = () => {
-  const [form, setForm] = useState(null);
+  const [formPersisted, setFormPersisted] = useState(false);
   const [iframeLoaded, setIframeLoaded] = useState(false);
 
   const formBlocks = useSelect(
@@ -57,7 +59,7 @@ const FormPreview = () => {
     []
   );
 
-  const loadFormPreviewFromServer = useCallback(() => {
+  const saveFormDataForPreview = useCallback(() => {
     const blocksToFormBody = blocksToFormBodyFactory(
       editorSettings.colors,
       editorSettings.fontSizes,
@@ -68,26 +70,25 @@ const FormPreview = () => {
       endpoint: 'forms',
       action: 'previewEditor',
       data: {
+        ...mapFormDataBeforeSaving(formData),
         body: blocksToFormBody(formBlocks),
-        settings: formData.settings,
       },
-    }).done((response) => {
-      setForm(response.data);
+    }).done(() => {
+      setFormPersisted(true);
     });
   }, [formBlocks, customFields, formData, editorSettings.colors, editorSettings.fontSizes]);
 
   useEffect(() => {
     if (isPreview) {
-      loadFormPreviewFromServer();
+      saveFormDataForPreview();
     }
     setIframeLoaded(false);
-  }, [isPreview, loadFormPreviewFromServer]);
-
+  }, [isPreview, saveFormDataForPreview]);
 
   if (!isPreview) return null;
 
   function onClose() {
-    setForm(null);
+    setFormPersisted(false);
     hidePreview();
   }
 
@@ -117,12 +118,12 @@ const FormPreview = () => {
       fullScreen
       contentClassName="mailpoet_form_preview_modal"
     >
-      {form === null && (
+      {!formPersisted && (
         <div className="mailpoet_spinner_wrapper">
           <Spinner />
         </div>
       )}
-      {form !== null && (
+      {formPersisted && (
         <>
           <div className="mailpoet_form_preview_type_select">
             <label>
diff --git a/lib/API/JSON/v1/Forms.php b/lib/API/JSON/v1/Forms.php
index c66fdd3b74..2a3c02d44e 100644
--- a/lib/API/JSON/v1/Forms.php
+++ b/lib/API/JSON/v1/Forms.php
@@ -7,7 +7,7 @@ use MailPoet\API\JSON\Error as APIError;
 use MailPoet\Config\AccessControl;
 use MailPoet\Form\DisplayFormInWPContent;
 use MailPoet\Form\FormFactory;
-use MailPoet\Form\Renderer as FormRenderer;
+use MailPoet\Form\PreviewPage;
 use MailPoet\Form\Util;
 use MailPoet\Listing;
 use MailPoet\Models\Form;
@@ -23,18 +23,15 @@ class Forms extends APIEndpoint {
   /** @var Listing\Handler */
   private $listingHandler;
 
-  /** @var Util\Styles */
-  private $formStylesUtils;
-
   /** @var UserFlagsController */
   private $userFlags;
 
-  /** @var FormRenderer */
-  private $formRenderer;
-
   /** @var FormFactory */
   private $formFactory;
 
+  /** @var WPFunctions */
+  private $wp;
+
   public $permissions = [
     'global' => AccessControl::PERMISSION_MANAGE_FORMS,
   ];
@@ -42,17 +39,15 @@ class Forms extends APIEndpoint {
   public function __construct(
     Listing\BulkActionController $bulkAction,
     Listing\Handler $listingHandler,
-    Util\Styles $formStylesUtils,
     UserFlagsController $userFlags,
-    FormRenderer $formRenderer,
-    FormFactory $formFactory
+    FormFactory $formFactory,
+    WPFunctions $wp
   ) {
     $this->bulkAction = $bulkAction;
     $this->listingHandler = $listingHandler;
-    $this->formStylesUtils = $formStylesUtils;
     $this->userFlags = $userFlags;
-    $this->formRenderer = $formRenderer;
     $this->formFactory = $formFactory;
+    $this->wp = $wp;
   }
 
   public function get($data = []) {
@@ -107,20 +102,12 @@ class Forms extends APIEndpoint {
   }
 
   public function previewEditor($data = []) {
-    // html
-    $html = $this->formRenderer->renderHTML($data);
-
-    // convert shortcodes
-    $html = WPFunctions::get()->doShortcode($html);
-
-    // styles
-    $css = $this->formStylesUtils->render($this->formRenderer->getStyles($data));
-
-    return $this->successResponse([
-      'html' => $html,
-      'css' => $css,
-      'form_element_styles' => $this->formRenderer->renderFormElementStyles($data),
-    ]);
+    $formId = $data['id'] ?? null;
+    if (!$formId) {
+      $this->badRequest();
+    }
+    $this->wp->setTransient(PreviewPage::PREVIEW_DATA_TRANSIENT_PREFIX . $formId, $data, PreviewPage::PREVIEW_DATA_EXPIRATION);
+    return $this->successResponse();
   }
 
   public function exportsEditor($data = []) {
diff --git a/lib/Form/PreviewPage.php b/lib/Form/PreviewPage.php
index cf69811872..0b0be146ab 100644
--- a/lib/Form/PreviewPage.php
+++ b/lib/Form/PreviewPage.php
@@ -6,6 +6,9 @@ use MailPoet\Config\Renderer as TemplateRenderer;
 use MailPoet\WP\Functions as WPFunctions;
 
 class PreviewPage {
+  const PREVIEW_DATA_TRANSIENT_PREFIX = 'mailpoet_form_preview_';
+  const PREVIEW_DATA_EXPIRATION = 84600; // 1 DAY
+
   /** @var WPFunctions  */
   private $wp;
 
@@ -52,6 +55,10 @@ class PreviewPage {
    * @return array|null
    */
   private function fetchFormData(int $id) {
+    $formData = $this->wp->getTransient(self::PREVIEW_DATA_TRANSIENT_PREFIX . $id);
+    if (is_array($formData)) {
+      return $formData;
+    }
     $form = $this->formRepository->findOneById($id);
     if ($form) {
       return [
diff --git a/tests/integration/API/JSON/v1/FormsTest.php b/tests/integration/API/JSON/v1/FormsTest.php
index 8db21a4ff1..843133ffc7 100644
--- a/tests/integration/API/JSON/v1/FormsTest.php
+++ b/tests/integration/API/JSON/v1/FormsTest.php
@@ -5,8 +5,10 @@ namespace MailPoet\Test\API\JSON\v1;
 use MailPoet\API\JSON\Response as APIResponse;
 use MailPoet\API\JSON\v1\Forms;
 use MailPoet\DI\ContainerWrapper;
+use MailPoet\Form\PreviewPage;
 use MailPoet\Models\Form;
 use MailPoet\Models\Segment;
+use MailPoet\WP\Functions as WPFunctions;
 
 class FormsTest extends \MailPoetTest {
   public $form3;
@@ -16,9 +18,13 @@ class FormsTest extends \MailPoetTest {
   /** @var Forms */
   private $endpoint;
 
+  /** @var WPFunctions */
+  private $wp;
+
   public function _before() {
     parent::_before();
     $this->endpoint = ContainerWrapper::getInstance()->get(Forms::class);
+    $this->wp = WPFunctions::get();
     $this->form1 = Form::createOrUpdate(['name' => 'Form 1']);
     $this->form2 = Form::createOrUpdate(['name' => 'Form 2']);
     $this->form3 = Form::createOrUpdate(['name' => 'Form 3']);
@@ -78,17 +84,21 @@ class FormsTest extends \MailPoetTest {
     );
   }
 
-  public function testItCanPreviewAForm() {
+  public function testItCanStoreDataForPreview() {
     $response = $this->endpoint->create();
+    $formId = $response->data['id'];
     expect($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data)->equals(
-      Form::where('id', $response->data['id'])->findOne()->asArray()
+      Form::where('id', $formId)->findOne()->asArray()
     );
+    $response->data['styles'] = '/* Custom Styles */';
 
     $response = $this->endpoint->previewEditor($response->data);
     expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['html'])->notEmpty();
-    expect($response->data['css'])->notEmpty();
+    $storedData = $this->wp->getTransient(PreviewPage::PREVIEW_DATA_TRANSIENT_PREFIX . $formId);
+    expect($storedData['body'])->notEmpty();
+    expect($storedData['styles'])->notEmpty();
+    expect($storedData['settings'])->notEmpty();
   }
 
   public function testItCanExportAForm() {