diff --git a/plugins/woocommerce-admin/packages/data/src/settings/use-settings.js b/plugins/woocommerce-admin/packages/data/src/settings/use-settings.js
index eb599fc79a3..11fabfd8740 100644
--- a/plugins/woocommerce-admin/packages/data/src/settings/use-settings.js
+++ b/plugins/woocommerce-admin/packages/data/src/settings/use-settings.js
@@ -30,7 +30,7 @@ export const useSettings = ( group, settingsKeys = [] ) => {
 				isDirty: getIsDirty( group, settingsKeys ),
 			};
 		},
-		[ group, settingsKeys ]
+		[ group, ...settingsKeys.sort() ]
 	);
 	const {
 		persistSettingsForGroup,
diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt
index 703f56bd874..649fe9d170f 100644
--- a/plugins/woocommerce-admin/readme.txt
+++ b/plugins/woocommerce-admin/readme.txt
@@ -102,6 +102,7 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt
 - Add: Remove Mollie promo note on install #6510
 - Add: Remote Inbox Notifications rule to trigger when WooCommerce Admin is upgraded. #6040
 - Feature: Increase target audience for business feature step. #6508
+- Fix: Crash of Analytics > Settings page when Gutenberg is installed. #6540
 
 == 2.1.0 ==