diff --git a/assets/js/src/form_editor/blocks/submit/edit.jsx b/assets/js/src/form_editor/blocks/submit/edit.jsx
index bca955217a..f69b4e735f 100644
--- a/assets/js/src/form_editor/blocks/submit/edit.jsx
+++ b/assets/js/src/form_editor/blocks/submit/edit.jsx
@@ -39,7 +39,7 @@ const SubmitEdit = ({ attributes, setAttributes }) => {
     fontWeight: attributes.styles.bold ? 'bold' : 'inherit',
     borderRadius: attributes.styles.borderRadius !== undefined ? `${attributes.styles.borderRadius}px` : 0,
     borderWidth: attributes.styles.borderSize !== undefined ? `${attributes.styles.borderSize}px` : '1px',
-    borderColor: attributes.styles.borderColor || 'initial',
+    borderColor: attributes.styles.borderColor || 'transparent',
     borderStyle: 'solid',
     fontSize: attributes.styles.fontSize ? `${attributes.styles.fontSize}px` : 'inherit',
     color: attributes.styles.fontColor || 'inherit',
diff --git a/lib/Form/BlockStylesRenderer.php b/lib/Form/BlockStylesRenderer.php
index 5f19a7aaa3..78fb2e2900 100644
--- a/lib/Form/BlockStylesRenderer.php
+++ b/lib/Form/BlockStylesRenderer.php
@@ -40,6 +40,9 @@ class BlockStylesRenderer {
     if (isset($styles['font_size'])) {
       $rules[] = "font-size:" . intval($styles['font_size']) . "px;";
     }
+    if (!isset($styles['border_color'])) {
+      $rules[] = "border-color:transparent;";
+    }
     if (isset($styles['bold']) && $styles['bold'] === '1') {
       $rules[] = "font-weight:bold;";
     }
diff --git a/tests/unit/Form/BlockStylesRendererTest.php b/tests/unit/Form/BlockStylesRendererTest.php
index 4ad949fbe3..464b0bf4af 100644
--- a/tests/unit/Form/BlockStylesRendererTest.php
+++ b/tests/unit/Form/BlockStylesRendererTest.php
@@ -48,12 +48,12 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
   }
 
   public function testItShouldRenderSingleButtonStyles() {
-    expect($this->renderer->renderForButton(['border_radius' => 10]))->equals('border-style:solid;border-radius:10px;');
+    expect($this->renderer->renderForButton(['border_radius' => 10]))->equals('border-style:solid;border-radius:10px;border-color:transparent;');
     expect($this->renderer->renderForButton(['border_color' => '#fff']))->equals('border-style:solid;border-color:#fff;');
-    expect($this->renderer->renderForButton(['border_size' => 10]))->equals('border-style:solid;border-width:10px;');
-    expect($this->renderer->renderForButton(['background_color' => '#dddddd']))->equals('background-color:#dddddd;');
-    expect($this->renderer->renderForButton(['font_color' => '#aaa']))->equals('color:#aaa;');
-    expect($this->renderer->renderForButton(['font_size' => 10]))->equals('font-size:10px;');
+    expect($this->renderer->renderForButton(['border_size' => 10]))->equals('border-style:solid;border-width:10px;border-color:transparent;');
+    expect($this->renderer->renderForButton(['background_color' => '#dddddd']))->equals('background-color:#dddddd;border-color:transparent;');
+    expect($this->renderer->renderForButton(['font_color' => '#aaa']))->equals('color:#aaa;border-color:transparent;');
+    expect($this->renderer->renderForButton(['font_size' => 10]))->equals('font-size:10px;border-color:transparent;');
   }
 
   public function testItShouldCompleteButtonStyles() {