diff --git a/modules/ppcp-settings/resources/js/data/onboarding/hooks.js b/modules/ppcp-settings/resources/js/data/onboarding/hooks.js
index 70999960c..bce5d8df0 100644
--- a/modules/ppcp-settings/resources/js/data/onboarding/hooks.js
+++ b/modules/ppcp-settings/resources/js/data/onboarding/hooks.js
@@ -15,7 +15,6 @@ import { STORE_NAME } from './constants';
 
 const useHooks = () => {
 	const { useTransient, usePersistent } = createHooksForStore( STORE_NAME );
-
 	const { persist } = useDispatch( STORE_NAME );
 
 	// Read-only flags and derived state.
diff --git a/modules/ppcp-settings/resources/js/data/settings-tab/hooks.js b/modules/ppcp-settings/resources/js/data/settings-tab/hooks.js
index 0c28428fd..31570f650 100644
--- a/modules/ppcp-settings/resources/js/data/settings-tab/hooks.js
+++ b/modules/ppcp-settings/resources/js/data/settings-tab/hooks.js
@@ -6,32 +6,20 @@
  *
  * @file
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useDispatch } from '@wordpress/data';
+
 import { STORE_NAME } from './constants';
-
-const useTransient = ( key ) =>
-	useSelect(
-		( select ) => select( STORE_NAME ).transientData()?.[ key ],
-		[ key ]
-	);
-
-const usePersistent = ( key ) =>
-	useSelect(
-		( select ) => select( STORE_NAME ).persistentData()?.[ key ],
-		[ key ]
-	);
+import { createHooksForStore } from '../utils';
 
 const useHooks = () => {
-	const { persist, setSettings } = useDispatch( STORE_NAME );
+	const { useTransient, usePersistent } = createHooksForStore( STORE_NAME );
+	const { persist } = useDispatch( STORE_NAME );
 
 	// Read-only flags and derived state.
-	const isReady = useTransient( 'isReady' );
+	const [ isReady ] = useTransient( 'isReady' );
 
 	// Persistent accessors.
-	const settings = useSelect(
-		( select ) => select( STORE_NAME ).persistentData(),
-		[]
-	);
+	const [ settings, setSettings ] = usePersistent( 'settings' );
 
 	return {
 		persist,