diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Navigation.js b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Navigation.js
index 9767730b7..e43644f7b 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Navigation.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Navigation.js
@@ -2,7 +2,6 @@ import { Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
 import TopNavigation from '../../../ReusableComponents/TopNavigation';
-import BusyStateWrapper from '../../../ReusableComponents/BusyStateWrapper';
 import { useSaveSettings } from '../../../../hooks/useSaveSettings';
 
 const SettingsNavigation = () => {
@@ -12,11 +11,9 @@ const SettingsNavigation = () => {
 
 	return (
 		<TopNavigation title={ title } exitOnTitleClick={ true }>
-			<BusyStateWrapper>
-				<Button variant="primary" onClick={ persistAll }>
-					{ __( 'Save', 'woocommerce-paypal-payments' ) }
-				</Button>
-			</BusyStateWrapper>
+			<Button variant="primary" onClick={ persistAll }>
+				{ __( 'Save', 'woocommerce-paypal-payments' ) }
+			</Button>
 		</TopNavigation>
 	);
 };
diff --git a/modules/ppcp-settings/resources/js/hooks/useSaveSettings.js b/modules/ppcp-settings/resources/js/hooks/useSaveSettings.js
index bc5e95f20..f268d3214 100644
--- a/modules/ppcp-settings/resources/js/hooks/useSaveSettings.js
+++ b/modules/ppcp-settings/resources/js/hooks/useSaveSettings.js
@@ -1,3 +1,5 @@
+import { useCallback } from '@wordpress/element';
+
 import {
 	CommonHooks,
 	PaymentHooks,
@@ -12,7 +14,7 @@ export const useSaveSettings = () => {
 	const { persist: persistSettings } = SettingsHooks.useStore();
 	const { persist: persistStyling } = StylingHooks.useStore();
 
-	const persistAll = () => {
+	const persistAll = useCallback( () => {
 		withActivity(
 			'persist-methods',
 			'Save payment methods',
@@ -28,7 +30,7 @@ export const useSaveSettings = () => {
 			'Save styling details',
 			persistStyling
 		);
-	};
+	}, [ persistPayment, persistSettings, persistStyling, withActivity ] );
 
 	return { persistAll };
 };