diff --git a/mailpoet/assets/js/src/email-editor/engine/store/initial-state.ts b/mailpoet/assets/js/src/email-editor/engine/store/initial-state.ts
index 8e42a6d65f..39b5ad0984 100644
--- a/mailpoet/assets/js/src/email-editor/engine/store/initial-state.ts
+++ b/mailpoet/assets/js/src/email-editor/engine/store/initial-state.ts
@@ -3,7 +3,6 @@ import { State } from './types';
 import {
   getEditorLayout,
   getEditorSettings,
-  getEmailStyles,
   getCdnUrl,
   isPremiumPluginActive,
   getEditorTheme,
@@ -24,7 +23,6 @@ export function getInitialState(): State {
     },
     postId,
     editorSettings: getEditorSettings(),
-    styles: getEmailStyles(),
     layout: getEditorLayout(),
     theme: getEditorTheme(),
     autosaveInterval: 60,
diff --git a/mailpoet/assets/js/src/email-editor/engine/store/selectors.ts b/mailpoet/assets/js/src/email-editor/engine/store/selectors.ts
index 4f7a8757f4..f9b6a12410 100644
--- a/mailpoet/assets/js/src/email-editor/engine/store/selectors.ts
+++ b/mailpoet/assets/js/src/email-editor/engine/store/selectors.ts
@@ -164,8 +164,8 @@ export function getPreviewState(state: State): State['preview'] {
   return state.preview;
 }
 
-export function getStyles(state: State): State['styles'] {
-  return state.styles;
+export function getStyles(state: State): State['theme']['styles'] {
+  return state.theme.styles;
 }
 
 export function getLayout(state: State): State['layout'] {
diff --git a/mailpoet/assets/js/src/email-editor/engine/store/settings.ts b/mailpoet/assets/js/src/email-editor/engine/store/settings.ts
index c51d5f4a8c..fec2fb1086 100644
--- a/mailpoet/assets/js/src/email-editor/engine/store/settings.ts
+++ b/mailpoet/assets/js/src/email-editor/engine/store/settings.ts
@@ -1,13 +1,9 @@
-import { EmailEditorSettings, EmailStyles, EmailEditorLayout } from './types';
+import { EmailEditorSettings, EmailEditorLayout, EmailTheme } from './types';
 
 export function getEditorSettings(): EmailEditorSettings {
   return window.MailPoetEmailEditor.editor_settings as EmailEditorSettings;
 }
 
-export function getEmailStyles(): EmailStyles {
-  return window.MailPoetEmailEditor.email_styles as EmailStyles;
-}
-
 export function getEditorLayout(): EmailEditorLayout {
   return window.MailPoetEmailEditor.editor_layout as EmailEditorLayout;
 }
@@ -20,6 +16,6 @@ export function isPremiumPluginActive(): boolean {
   return window.MailPoetEmailEditor.is_premium_plugin_active;
 }
 
-export function getEditorTheme(): EmailStyles {
-  return window.MailPoetEmailEditor.editor_theme as EmailStyles;
+export function getEditorTheme(): EmailTheme {
+  return window.MailPoetEmailEditor.editor_theme as EmailTheme;
 }
diff --git a/mailpoet/assets/js/src/email-editor/engine/store/types.ts b/mailpoet/assets/js/src/email-editor/engine/store/types.ts
index ea078c24ba..0da11eb279 100644
--- a/mailpoet/assets/js/src/email-editor/engine/store/types.ts
+++ b/mailpoet/assets/js/src/email-editor/engine/store/types.ts
@@ -26,6 +26,11 @@ export type ExperimentalSettings = {
 
 export type EmailEditorSettings = EditorSettings & ExperimentalSettings;
 
+export type EmailTheme = {
+  version: number;
+  styles: EmailStyles;
+};
+
 export type EmailStyles = {
   spacing: {
     blockGap: string;
@@ -73,9 +78,8 @@ export type State = {
   };
   postId: number;
   editorSettings: EmailEditorSettings;
-  styles: EmailStyles;
   layout: EmailEditorLayout;
-  theme: EmailStyles;
+  theme: EmailTheme;
   autosaveInterval: number;
   cdnUrl: string;
   isPremiumPluginActive: boolean;
diff --git a/mailpoet/lib/AdminPages/Pages/EmailEditor.php b/mailpoet/lib/AdminPages/Pages/EmailEditor.php
index 46502227d4..886950e0fd 100644
--- a/mailpoet/lib/AdminPages/Pages/EmailEditor.php
+++ b/mailpoet/lib/AdminPages/Pages/EmailEditor.php
@@ -82,7 +82,6 @@ class EmailEditor {
         'is_premium_plugin_active' => (bool)$this->servicesChecker->isPremiumPluginActive(),
         'current_wp_user_email' => esc_js($currentUserEmail),
         'editor_settings' => $this->settingsController->getSettings(),
-        'email_styles' => $this->settingsController->getEmailStyles(),
         'editor_layout' => $this->settingsController->getLayout(),
         'editor_theme' => $this->themeController->getTheme()->get_raw_data(),
         'bc_state' => $this->getBackwardCompatibilityState(),
diff --git a/mailpoet/lib/EmailEditor/Engine/EmailApiController.php b/mailpoet/lib/EmailEditor/Engine/EmailApiController.php
index bef27065d2..441a760a48 100644
--- a/mailpoet/lib/EmailEditor/Engine/EmailApiController.php
+++ b/mailpoet/lib/EmailEditor/Engine/EmailApiController.php
@@ -5,22 +5,12 @@ namespace MailPoet\EmailEditor\Engine;
 use MailPoet\Validator\Builder;
 
 class EmailApiController {
-  /** @var SettingsController */
-  private $settingsController;
-
-  public function __construct(
-    SettingsController $settingsController
-  ) {
-    $this->settingsController = $settingsController;
-  }
-
   /**
    * @return array - Email specific data such styles.
    */
   public function getEmailData(): array {
-    return [
-      'layout_styles' => $this->settingsController->getEmailStyles(),
-    ];
+    // Here comes code getting Email specific data that will be passed on 'email_data' attribute
+    return [];
   }
 
   /**
@@ -31,17 +21,6 @@ class EmailApiController {
   }
 
   public function getEmailDataSchema(): array {
-    return Builder::object([
-      'layout_styles' => Builder::object([
-        'width' => Builder::string(),
-        'background' => Builder::string(),
-        'padding' => Builder::object([
-          'bottom' => Builder::string(),
-          'left' => Builder::string(),
-          'right' => Builder::string(),
-          'top' => Builder::string(),
-        ]),
-      ]),
-    ])->toArray();
+    return Builder::object()->toArray();
   }
 }