diff --git a/assets/js/src/form_editor/components/close_button_settings.tsx b/assets/js/src/form_editor/components/close_button_settings.tsx
index 2ef1bf2605..16e62de274 100644
--- a/assets/js/src/form_editor/components/close_button_settings.tsx
+++ b/assets/js/src/form_editor/components/close_button_settings.tsx
@@ -47,6 +47,7 @@ const CloseButtonsSettings = ({
     (sel) => sel('mailpoet-form-editor').getCloseIconsUrl(),
     []
   );
+  const current = value ?? 'round_white';
   return (
     <div>
       <h3 className="mailpoet-styles-settings-heading">
diff --git a/lib/Form/DisplayFormInWPContent.php b/lib/Form/DisplayFormInWPContent.php
index 5b9eeffb41..edecb3be2e 100644
--- a/lib/Form/DisplayFormInWPContent.php
+++ b/lib/Form/DisplayFormInWPContent.php
@@ -146,7 +146,7 @@ class DisplayFormInWPContent {
       'form_type' => $displayType,
       'styles' => $this->formRenderer->renderStyles($formData, '#' . $htmlId, $displayType),
       'html' => $this->formRenderer->renderHTML($formData),
-      'close_button_icon' => $formSettings['close_button'] ?? 'classic',
+      'close_button_icon' => $formSettings['close_button'] ?? 'round_white',
     ];
 
     // (POST) non ajax success/error variables