diff --git a/firestore/src/main/aggregate_query_main.cc b/firestore/src/main/aggregate_query_main.cc
index 2b1a0aa2ee..86d5cf6e14 100644
--- a/firestore/src/main/aggregate_query_main.cc
+++ b/firestore/src/main/aggregate_query_main.cc
@@ -71,9 +71,7 @@ Future<AggregateQuerySnapshot> AggregateQueryInternal::Get(
 
 bool operator==(const AggregateQueryInternal& lhs,
                 const AggregateQueryInternal& rhs) {
-  // TODO(b/276440573) - there needs to be equals operator defined on
-  // api::AggregateQuery
-  return lhs.aggregate_query_.query() == rhs.aggregate_query_.query();
+  return lhs.aggregate_query_ == rhs.aggregate_query_;
 }
 
 }  // namespace firestore
diff --git a/firestore/src/main/aggregate_query_snapshot_main.cc b/firestore/src/main/aggregate_query_snapshot_main.cc
index 4565b409e1..83408c3ff1 100644
--- a/firestore/src/main/aggregate_query_snapshot_main.cc
+++ b/firestore/src/main/aggregate_query_snapshot_main.cc
@@ -45,9 +45,7 @@ int64_t AggregateQuerySnapshotInternal::count() const { return count_result_; }
 
 bool operator==(const AggregateQuerySnapshotInternal& lhs,
                 const AggregateQuerySnapshotInternal& rhs) {
-  // TODO(b/276440573) - there needs to be equals operator defined on
-  // api::AggregateQuery
-  return lhs.aggregate_query_.query() == rhs.aggregate_query_.query() &&
+  return lhs.aggregate_query_ == rhs.aggregate_query_ &&
          lhs.count_result_ == rhs.count_result_;
 }