diff --git a/lib/ash_cub_db/data_layer.ex b/lib/ash_cub_db/data_layer.ex
index 922116e..4676c50 100644
--- a/lib/ash_cub_db/data_layer.ex
+++ b/lib/ash_cub_db/data_layer.ex
@@ -126,6 +126,7 @@ defmodule AshCubDB.DataLayer do
          {:ok, db} <- start(resource),
          {:ok, record} <- Changeset.apply_attributes(changeset),
          {:ok, key, data} <- Serde.serialise(record),
+         {:ok, key} <- maybe_wrap_in_tenant(key, changeset),
          true <- CubDB.has_key?(db, key),
          :ok <- CubDB.put(db, key, data) do
       {:ok, set_loaded(record)}