diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47e10b6..f806e25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,12 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Added support for `exclude_none` and `exclude_unset` in `save` method.
 
+## Fixed
+
+- Switched Firestore `query.where()` to use the 'filter' keyword argument instead of
+  positional arguments. This eliminates a UserWarning that was introduced in
+  `google-cloud-firestore` 2.11.0.
+
 ## [0.8.1] - 2024-12-09
 
 ### Changed
diff --git a/firedantic/_async/model.py b/firedantic/_async/model.py
index 5a78c07..b500c22 100644
--- a/firedantic/_async/model.py
+++ b/firedantic/_async/model.py
@@ -194,7 +194,8 @@ def _add_filter(
                 query: AsyncQuery = query.where(filter=_filter)  # type: ignore
             return query
         else:
-            query: AsyncQuery = query.where(field, "==", value)  # type: ignore
+            _filter = FieldFilter(field, "==", value)
+            query: AsyncQuery = query.where(filter=_filter)  # type: ignore
             return query
 
     @classmethod
diff --git a/firedantic/_sync/model.py b/firedantic/_sync/model.py
index de99c69..4385df0 100644
--- a/firedantic/_sync/model.py
+++ b/firedantic/_sync/model.py
@@ -192,7 +192,8 @@ def _add_filter(
                 query: BaseQuery = query.where(filter=_filter)  # type: ignore
             return query
         else:
-            query: BaseQuery = query.where(field, "==", value)  # type: ignore
+            _filter = FieldFilter(field, "==", value)
+            query: BaseQuery = query.where(filter=_filter)  # type: ignore
             return query
 
     @classmethod