diff --git a/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp b/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp
index 66a192d15dd1..5f087328b300 100644
--- a/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp
+++ b/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp
@@ -6,9 +6,9 @@
 
 #include "persistent_storage_shell.h"
 
-#ifdef CONFIG_NVS
+#if defined(CONFIG_NVS)
 #include <zephyr/fs/nvs.h>
-#elif CONFIG_ZMS
+#elif defined(CONFIG_ZMS)
 #include <zephyr/fs/zms.h>
 #endif
 #include <zephyr/settings/settings.h>
@@ -18,9 +18,9 @@ using namespace Nrf;
 
 namespace
 {
-#ifdef CONFIG_NVS
+#if defined(CONFIG_NVS)
 nvs_fs *sStorage = nullptr;
-#elif CONFIG_ZMS
+#elif defined(CONFIG_ZMS)
 zms_fs *sStorage = nullptr;
 #endif
 
@@ -32,9 +32,9 @@ struct SettingsParams {
 
 int CalculateFreeSpace()
 {
-#ifdef CONFIG_NVS
+#if defined(CONFIG_NVS)
 	return nvs_calc_free_space(sStorage);
-#elif CONFIG_ZMS
+#elif defined(CONFIG_ZMS)
 	return zms_calc_free_space(sStorage);
 #endif
 }
@@ -133,9 +133,9 @@ bool PersistentStorageShell::Init()
 		return false;
 	}
 
-#ifdef CONFIG_NVS
+#if defined(CONFIG_NVS)
 	sStorage = reinterpret_cast<nvs_fs *>(storage);
-#elif CONFIG_ZMS
+#elif defined(CONFIG_ZMS)
 	sStorage = reinterpret_cast<zms_fs *>(storage);
 #endif
 
diff --git a/west.yml b/west.yml
index 715904afbfbd..2466c8a6ae09 100644
--- a/west.yml
+++ b/west.yml
@@ -161,7 +161,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: 9a4ea8e45736c356a58bd7b29774d18a8d78441f
+      revision: pull/496/head
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio