diff --git a/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
index 538a668e757..c181dd6d2c9 100644
--- a/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
@@ -806,10 +806,10 @@ - (void)testPinsDocumentsInTheLocalView {
   FSTAssertContains(Doc("foo/baz", 2, Map("foo", "baz")));
 
   [self notifyLocalViewChanges:TestViewChanges(targetID, @[], @[ @"foo/bar", @"foo/baz" ])];
-  [self.localStore releaseQuery:query];
-
   FSTAssertNotContains("foo/bar");
   FSTAssertNotContains("foo/baz");
+
+  [self.localStore releaseQuery:query];
 }
 
 - (void)testThrowsAwayDocumentsWithUnknownTargetIDsImmediately {
diff --git a/Firestore/Source/Local/FSTLocalStore.mm b/Firestore/Source/Local/FSTLocalStore.mm
index 91413193b5d..f1afe5c6ffc 100644
--- a/Firestore/Source/Local/FSTLocalStore.mm
+++ b/Firestore/Source/Local/FSTLocalStore.mm
@@ -414,7 +414,7 @@ - (void)notifyLocalViewChanges:(const std::vector<LocalViewChanges> &)viewChange
         [self->_persistence.referenceDelegate removeReference:key];
       }
       _localViewReferences.AddReferences(viewChange.added_keys(), viewChange.target_id());
-      _localViewReferences.AddReferences(viewChange.removed_keys(), viewChange.target_id());
+      _localViewReferences.RemoveReferences(viewChange.removed_keys(), viewChange.target_id());
     }
   });
 }