diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js
index c579390..e88dc8d 100644
--- a/src/module/actor/entity.js
+++ b/src/module/actor/entity.js
@@ -215,7 +215,7 @@ export class OseActor extends Actor {
     };
 
     let dmgParts = [];
-    if (!attData.dmg || !game.settings.get("ose", "variableWeaponDamage")) {
+    if ((!attData.dmg || !game.settings.get("ose", "variableWeaponDamage")) && this.type == "character") {
       dmgParts.push("1d6");
     } else {
       dmgParts.push(attData.dmg);
@@ -243,8 +243,8 @@ export class OseActor extends Actor {
 
     const rollParts = ["1d20"];
     const dmgParts = [];
-
-    if (!attData.dmg || !game.settings.get("ose", "variableWeaponDamage")) {
+    
+    if ((!attData.dmg || !game.settings.get("ose", "variableWeaponDamage")) && this.type == "character") {
       dmgParts.push("1d6");
     } else {
       dmgParts.push(attData.dmg);
diff --git a/src/module/item/entity.js b/src/module/item/entity.js
index f0dda5f..87333c8 100644
--- a/src/module/item/entity.js
+++ b/src/module/item/entity.js
@@ -57,7 +57,7 @@ export class OseItem extends Item {
     } else if (this.data.data.melee && !isNPC) {
       this.actor.rollAttack({type: 'melee', label: this.name, dmg: this.data.data.damage});
     } else {
-      this.actor.rollAttack({type: 'raw', label: this.name});
+      this.actor.rollAttack({type: 'raw', label: this.name, dmg: this.data.data.damage});
     }
     return true;
   }