diff --git a/lib/ash/data_layer/ets/ets.ex b/lib/ash/data_layer/ets/ets.ex
index b82e92e3..077ac3c0 100644
--- a/lib/ash/data_layer/ets/ets.ex
+++ b/lib/ash/data_layer/ets/ets.ex
@@ -1019,10 +1019,20 @@ defmodule Ash.DataLayer.Ets do
          conflicting_upsert_values \\ nil
        )
 
+  defp filter_matches([], _, _domain, _tenant, _parent, _conflicting_upsert_values),
+    do: {:ok, []}
+
   defp filter_matches(records, nil, _domain, _tenant, _parent, _conflicting_upsert_values),
     do: {:ok, records}
 
-  defp filter_matches(records, filter, domain, tenant, parent, conflicting_upsert_values) do
+  defp filter_matches(
+         records,
+         filter,
+         domain,
+         tenant,
+         parent,
+         conflicting_upsert_values
+       ) do
     Ash.Filter.Runtime.filter_matches(domain, records, filter,
       parent: parent,
       tenant: tenant,
@@ -1075,8 +1085,7 @@ defmodule Ash.DataLayer.Ets do
                  upsert_conflict_check(
                    changeset,
                    result,
-                   conflicting_upsert_values,
-                   opts[:upsert_condition]
+                   conflicting_upsert_values
                  ) do
             changeset =
               changeset
@@ -1086,7 +1095,7 @@ defmodule Ash.DataLayer.Ets do
 
             update(
               resource,
-              %{changeset | action_type: :update},
+              %{changeset | action_type: :update, filter: nil},
               Map.take(result, pkey),
               opts[:from_bulk_create?]
             )
@@ -1107,29 +1116,26 @@ defmodule Ash.DataLayer.Ets do
   @spec upsert_conflict_check(
           changeset :: Ash.Changeset.t(),
           subject :: record,
-          conflicting_upsert_values :: record,
-          opts_upsert_condition :: Ash.Expr.t()
+          conflicting_upsert_values :: record
         ) :: {:ok, [record]} | {:error, reason}
         when record: Ash.Resource.record(), reason: term()
-  defp upsert_conflict_check(changeset, subject, conflicting_upsert_values, opts_upsert_condition)
+  defp upsert_conflict_check(changeset, subject, conflicting_upsert_values)
 
   defp upsert_conflict_check(
          %Ash.Changeset{filter: nil},
          result,
-         _conflicting_upsert_values,
-         nil
+         _conflicting_upsert_values
        ),
        do: {:ok, [result]}
 
   defp upsert_conflict_check(
          %Ash.Changeset{filter: filter, domain: domain, context: context},
          result,
-         conflicting_upsert_values,
-         opts_upsert_condition
+         conflicting_upsert_values
        ) do
     filter_matches(
       [result],
-      opts_upsert_condition || filter,
+      filter,
       domain,
       nil,
       context[:tenant],
diff --git a/lib/ash/filter/filter.ex b/lib/ash/filter/filter.ex
index 6f75ed7a..080c18d3 100644
--- a/lib/ash/filter/filter.ex
+++ b/lib/ash/filter/filter.ex
@@ -3395,6 +3395,12 @@ defmodule Ash.Filter do
     do_hydrate_refs(value, context)
   end
 
+  def do_hydrate_refs(%__MODULE__{expression: expression} = filter, context) do
+    with {:ok, expr} <- do_hydrate_refs(expression, context) do
+      {:ok, %{filter | expression: expr}}
+    end
+  end
+
   def do_hydrate_refs({:_ref, value}, context) do
     do_hydrate_refs(
       %Ash.Query.Ref{