diff --git a/modules/ppcp-settings/resources/js/Components/App.js b/modules/ppcp-settings/resources/js/Components/App.js
index b719cb575..9d724dda6 100644
--- a/modules/ppcp-settings/resources/js/Components/App.js
+++ b/modules/ppcp-settings/resources/js/Components/App.js
@@ -9,7 +9,6 @@ import SettingsScreen from './Screens/Settings';
 
 const SettingsApp = () => {
 	const onboardingProgress = OnboardingHooks.useSteps();
-	const { isReady: settingsIsReady } = SettingsHooks.useStore();
 	const {
 		isReady: merchantIsReady,
 		merchant: { isSendOnlyCountry },
@@ -32,11 +31,7 @@ const SettingsApp = () => {
 	} );
 
 	const Content = useMemo( () => {
-		if (
-			! onboardingProgress.isReady ||
-			! merchantIsReady ||
-			! settingsIsReady
-		) {
+		if ( ! onboardingProgress.isReady || ! merchantIsReady ) {
 			return <SpinnerOverlay />;
 		}
 		if ( isSendOnlyCountry ) {
@@ -51,7 +46,6 @@ const SettingsApp = () => {
 		merchantIsReady,
 		onboardingProgress.completed,
 		onboardingProgress.isReady,
-		settingsIsReady,
 	] );
 
 	return <div className={ wrapperClass }>{ Content }</div>;
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettings.js b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettings.js
index fd2b6b564..a8eff3186 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettings.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettings.js
@@ -2,8 +2,10 @@ import ConnectionStatus from './TabSettingsElements/ConnectionStatus';
 import CommonSettings from './TabSettingsElements/CommonSettings';
 import ExpertSettings from './TabSettingsElements/ExpertSettings';
 import { SettingsHooks } from '../../../data';
+import SpinnerOverlay from '../../ReusableComponents/SpinnerOverlay';
 
 const TabSettings = () => {
+	const { isReady } = SettingsHooks.useStore();
 	const { settings, setSettings } = SettingsHooks.useSettings();
 
 	const updateFormValue = ( key, value ) => {
@@ -13,6 +15,10 @@ const TabSettings = () => {
 		} );
 	};
 
+	if ( ! isReady ) {
+		return <SpinnerOverlay />;
+	}
+
 	return (
 		<>
 			<div className="ppcp-r-settings">