diff --git a/module/data/item/base.mjs b/module/data/item/base.mjs
index c86086f9..8dedf485 100644
--- a/module/data/item/base.mjs
+++ b/module/data/item/base.mjs
@@ -165,7 +165,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
      */
     getRollData(options = {}) {
         const data = this.actor?.getRollData() ?? {};
-        data.item = this;
+        data.item = shallowCopyWithGetters(this);
         return data;
     }
 
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index 8ece56fa..93aa3b28 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -54,13 +54,7 @@ export default class DHItem extends foundry.documents.Item {
      * @returns
      */
     getRollData(options = {}) {
-        let data;
-        if (this.system.getRollData) data = this.system.getRollData(options);
-        else {
-            const actorRollData = this.actor?.getRollData(options) ?? {};
-            data = { ...actorRollData, item: { ...this.system } };
-        }
-
+        let data = this.system.getRollData(options);
         if (data?.item) {
             data.item.flags = { ...this.flags };
             data.item.name = this.name;