diff --git a/.changeset/silly-vans-fix.md b/.changeset/silly-vans-fix.md
new file mode 100644
index 00000000000..fe34d802443
--- /dev/null
+++ b/.changeset/silly-vans-fix.md
@@ -0,0 +1,6 @@
+---
+'@firebase/firestore': patch
+'firebase': patch
+---
+
+Refactor client-side indexing code to be tree-shakable. This should reduce code size by about 23 kB for applications that enable IndexedDb persistence but do _not_ call either `enablePersistentCacheIndexAutoCreation()` or `setIndexConfiguration()`.