diff --git a/src/documents/filters.py b/src/documents/filters.py
index c471f8df6..f0a9a55b3 100644
--- a/src/documents/filters.py
+++ b/src/documents/filters.py
@@ -417,11 +417,9 @@ class CustomFieldQueryParser:
         value_field_name = CustomFieldInstance.get_value_field_name(
             custom_field.data_type,
         )
-        if custom_field.data_type == CustomField.FieldDataType.MONETARY and op in (
-            "gt",
-            "gte",
-            "lt",
-            "lte",
+        if (
+            custom_field.data_type == CustomField.FieldDataType.MONETARY
+            and op in self.EXPR_BY_CATEGORY["arithmetic"]
         ):
             value_field_name = "value_monetary_amount"
         has_field = Q(custom_fields__field=custom_field)