From e996da3fa38240de2f4268fe44784d963570611d Mon Sep 17 00:00:00 2001
From: Aaron Casanova <32409546+aaronccasanova@users.noreply.github.com>
Date: Wed, 27 Sep 2023 13:59:55 -0700
Subject: [PATCH] Revert "Revert "[Filters] Fix hitting max call depth when
 appliedFilters is undefined" (#10734)"

This reverts commit f3e8677f6bca5df278643bf7367aba4af32c262a.
---
 .changeset/seven-apricots-provide.md             | 5 +++++
 polaris-react/src/components/Filters/Filters.tsx | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/seven-apricots-provide.md

diff --git a/.changeset/seven-apricots-provide.md b/.changeset/seven-apricots-provide.md
new file mode 100644
index 00000000000..2a251b4bfad
--- /dev/null
+++ b/.changeset/seven-apricots-provide.md
@@ -0,0 +1,5 @@
+---
+'@shopify/polaris': patch
+---
+
+Fixed issue with setting local pinned filters in `Filters` when no `appliedFilters` were provided.
diff --git a/polaris-react/src/components/Filters/Filters.tsx b/polaris-react/src/components/Filters/Filters.tsx
index 9f3eb70017c..fdfe3987e7a 100644
--- a/polaris-react/src/components/Filters/Filters.tsx
+++ b/polaris-react/src/components/Filters/Filters.tsx
@@ -165,9 +165,9 @@ export function Filters({
   );
 
   useEffect(() => {
-    const allAppliedFilterKeysInLocalPinnedFilters = appliedFilterKeys?.every(
-      (value) => localPinnedFilters.includes(value),
-    );
+    const allAppliedFilterKeysInLocalPinnedFilters =
+      !appliedFilterKeys ||
+      appliedFilterKeys.every((value) => localPinnedFilters.includes(value));
 
     if (!allAppliedFilterKeysInLocalPinnedFilters) {
       setLocalPinnedFilters((currentLocalPinnedFilters: string[]): string[] => {