diff --git a/modules/ppcp-settings/resources/js/Components/App.js b/modules/ppcp-settings/resources/js/Components/App.js
index adfd79554..fb84d49b1 100644
--- a/modules/ppcp-settings/resources/js/Components/App.js
+++ b/modules/ppcp-settings/resources/js/Components/App.js
@@ -6,12 +6,8 @@ import SpinnerOverlay from './ReusableComponents/SpinnerOverlay';
 import SendOnlyMessage from './Screens/SendOnlyMessage';
 import OnboardingScreen from './Screens/Onboarding';
 import SettingsScreen from './Screens/Settings';
-import { initStore as initSettingsStore } from '../data/settings-tab';
 import { useStore } from '../data/settings-tab/hooks';
 
-// Initialize the settings store
-initSettingsStore();
-
 const SettingsApp = () => {
 	const onboardingProgress = OnboardingHooks.useSteps();
 	const { isReady: settingsIsReady } = useStore();
diff --git a/modules/ppcp-settings/resources/js/data/index.js b/modules/ppcp-settings/resources/js/data/index.js
index 393c09db2..a205a8b79 100644
--- a/modules/ppcp-settings/resources/js/data/index.js
+++ b/modules/ppcp-settings/resources/js/data/index.js
@@ -1,24 +1,34 @@
 import { addDebugTools } from './debug';
 import * as Onboarding from './onboarding';
 import * as Common from './common';
-import * as Styling from './styling';
 import * as Payment from './payment';
+import * as Settings from './settings-tab';
+import * as Styling from './styling';
 
 Onboarding.initStore();
 Common.initStore();
 Payment.initStore();
+Settings.initStore();
 Styling.initStore();
 
 export const OnboardingHooks = Onboarding.hooks;
 export const CommonHooks = Common.hooks;
 export const PaymentHooks = Payment.hooks;
+export const SettingsHooks = Settings.hooks;
 export const StylingHooks = Styling.hooks;
 
 export const OnboardingStoreName = Onboarding.STORE_NAME;
 export const CommonStoreName = Common.STORE_NAME;
 export const PaymentStoreName = Payment.STORE_NAME;
+export const SettingsStoreName = Settings.STORE_NAME;
 export const StylingStoreName = Styling.STORE_NAME;
 
 export * from './configuration';
 
-addDebugTools( window.ppcpSettings, [ Onboarding, Common, Payment, Styling ] );
+addDebugTools( window.ppcpSettings, [
+	Onboarding,
+	Common,
+	Payment,
+	Settings,
+	Styling,
+] );
diff --git a/modules/ppcp-settings/resources/js/data/settings-tab/index.js b/modules/ppcp-settings/resources/js/data/settings-tab/index.js
index affca562e..ddcf6096d 100644
--- a/modules/ppcp-settings/resources/js/data/settings-tab/index.js
+++ b/modules/ppcp-settings/resources/js/data/settings-tab/index.js
@@ -9,6 +9,7 @@
 
 import { createReduxStore, register } from '@wordpress/data';
 import { controls as wpControls } from '@wordpress/data-controls';
+
 import { STORE_NAME } from './constants';
 import reducer from './reducer';
 import * as selectors from './selectors';