diff --git a/mailpoet/assets/js/src/email-editor/engine/components/block-editor/visual-editor/visual-editor.tsx b/mailpoet/assets/js/src/email-editor/engine/components/block-editor/visual-editor/visual-editor.tsx
index 1d064b8e13..0199358574 100644
--- a/mailpoet/assets/js/src/email-editor/engine/components/block-editor/visual-editor/visual-editor.tsx
+++ b/mailpoet/assets/js/src/email-editor/engine/components/block-editor/visual-editor/visual-editor.tsx
@@ -176,7 +176,6 @@ export function VisualEditor({
           <BlockList
             className={classnames(
               `is-${deviceType.toLowerCase()}-preview`,
-              'wp-site-blocks',
               'has-global-padding', // Ensures that padding is applied at the top level
             )}
             // @ts-expect-error No types for this exist yet.
diff --git a/packages/php/email-editor/src/Engine/Renderer/ContentRenderer/Preprocessors/SpacingPreprocessor.php b/packages/php/email-editor/src/Engine/Renderer/ContentRenderer/Preprocessors/SpacingPreprocessor.php
index 09972a455b..f262622ef8 100644
--- a/packages/php/email-editor/src/Engine/Renderer/ContentRenderer/Preprocessors/SpacingPreprocessor.php
+++ b/packages/php/email-editor/src/Engine/Renderer/ContentRenderer/Preprocessors/SpacingPreprocessor.php
@@ -16,8 +16,13 @@ class SpacingPreprocessor implements Preprocessor {
     foreach ($parsedBlocks as $key => $block) {
       $parentBlockName = $parentBlock['blockName'] ?? '';
 
-      // Do not add a gap to the first child, or if the parent block is a buttons block (where buttons are side by side).
-      if ($key !== 0 && $gap && $parentBlockName !== 'core/buttons') {
+      /**
+       * Do not add a gap to:
+       * - the top level blocks - they are post-content, and header and footer wrappers and we don't want a gap between those
+       * - first child
+       * - parent block is a buttons block (where buttons are side by side).
+       **/
+      if ($parentBlock && $key !== 0 && $gap && $parentBlockName !== 'core/buttons') {
         $block['email_attrs']['margin-top'] = $gap;
       }