diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index d9bf6aa3..6a8566dd 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -125,7 +125,10 @@ export default class DHRoll extends Roll {
 
         const reloadSetting = 
             game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).reload;
-        const useReload = item?.system.hasReload && reloadSetting === CONFIG.DH.SETTINGS.reloadChoices.auto.id;
+        const useReload = 
+            item?.system.hasReload && 
+            action?.type === 'attack' && 
+            reloadSetting === CONFIG.DH.SETTINGS.reloadChoices.auto.id;
         const needReload = useReload ? await action?.handleReload?.() : false;
         
         const cls = getDocumentClass('ChatMessage'),
@@ -162,6 +165,7 @@ export default class DHRoll extends Roll {
         return foundry.applications.handlebars.renderTemplate(template, {
             roll: this,
             ...chatData,
+            action: chatData.action,
             parent: chatData.parent,
             targetMode: chatData.targetMode,
             areas: chatData.action?.areas,
diff --git a/templates/ui/chat/roll.hbs b/templates/ui/chat/roll.hbs
index 745a6f4b..bf094b13 100644
--- a/templates/ui/chat/roll.hbs
+++ b/templates/ui/chat/roll.hbs
@@ -1,15 +1,18 @@
 <div class="chat-roll">
     <div class="roll-part-title"><span>{{title}}</span></div>
-    {{#if (and needReload (eq automationSettings.reload 'auto'))}}
-        <p class="roll-reload-container">{{localize "DAGGERHEART.ACTIONS.Reload.reloadRequired"}}</p>
-    {{/if}}
-    {{#if (eq automationSettings.reload 'button')}}
-        <div class="roll-reload-container">
-            {{#if needReload}}
-                <p class=>{{localize "DAGGERHEART.ACTIONS.Reload.reloadRequired"}}</p>
-            {{/if}}
-            <button class="roll-reload-check" {{#if needReload}}disabled{{/if}}>{{localize "DAGGERHEART.ACTIONS.Reload.checkReload"}}</button>
-        </div>
+    
+    {{#if (eq action.type 'attack')}}
+        {{#if (and needReload (eq automationSettings.reload 'auto'))}}
+            <p class="roll-reload-container">{{localize "DAGGERHEART.ACTIONS.Reload.reloadRequired"}}</p>
+        {{/if}}
+        {{#if (eq automationSettings.reload 'button')}}
+            <div class="roll-reload-container">
+                {{#if needReload}}
+                    <p class=>{{localize "DAGGERHEART.ACTIONS.Reload.reloadRequired"}}</p>
+                {{/if}}
+                <button class="roll-reload-check" {{#if needReload}}disabled{{/if}}>{{localize "DAGGERHEART.ACTIONS.Reload.checkReload"}}</button>
+            </div>
+        {{/if}}
     {{/if}}
 
     {{#if actionDescription}}{{> 'systems/daggerheart/templates/ui/chat/parts/description-part.hbs'}}{{/if}}