diff --git a/module/applications/dialogs/riskItAllDialog.mjs b/module/applications/dialogs/riskItAllDialog.mjs
index 9bdd5dc2..10fa1bb4 100644
--- a/module/applications/dialogs/riskItAllDialog.mjs
+++ b/module/applications/dialogs/riskItAllDialog.mjs
@@ -41,6 +41,8 @@ export default class RiskItAllDialog extends HandlebarsApplicationMixin(Applicat
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
         context.resourceValue = this.resourceValue;
+        context.maxHitPointsValue = Math.min(this.resourceValue, this.actor.system.resources.hitPoints.max);
+        context.maxStressValue = Math.min(this.resourceValue, this.actor.system.resources.stress.max);
         context.remainingResource = this.resourceValue - this.choices.hitPoints - this.choices.stress;
         context.unfinished = context.remainingResource !== 0;
 
diff --git a/module/enrichers/FateRollEnricher.mjs b/module/enrichers/FateRollEnricher.mjs
index c50a563b..0cafd4b6 100644
--- a/module/enrichers/FateRollEnricher.mjs
+++ b/module/enrichers/FateRollEnricher.mjs
@@ -45,7 +45,6 @@ function getFateMessage(roll, flavor) {
 export const renderFateButton = async event => {
     const button = event.currentTarget,
         target = getCommandTarget({ allowNull: true });
-    console.log('button', button);
 
     const fateTypeData = getFateTypeData(button.dataset?.fatetype);
 
diff --git a/templates/dialogs/riskItAllDialog.hbs b/templates/dialogs/riskItAllDialog.hbs
index edb2fbf6..98f89416 100644
--- a/templates/dialogs/riskItAllDialog.hbs
+++ b/templates/dialogs/riskItAllDialog.hbs
@@ -10,11 +10,11 @@
         <div class="resource-section">
             <div class="resource-container">
                 <label>{{localize "DAGGERHEART.APPLICATIONS.RiskItAllDialog.clearResource" resource=(localize "DAGGERHEART.GENERAL.HitPoints.short")}}: {{this.choices.hitPoints}}</label>
-                <input type="range" step="1" min="0" max="{{this.resourceValue}}" value="{{this.choices.hitPoints}}" name="choices.hitPoints" data-choice="hitPoints" />
+                <input type="range" step="1" min="0" max="{{this.maxHitPointsValue}}" value="{{this.choices.hitPoints}}" name="choices.hitPoints" data-choice="hitPoints" />
             </div>
             <div class="resource-container">
                 <label>{{localize "DAGGERHEART.APPLICATIONS.RiskItAllDialog.clearResource" resource=(localize "DAGGERHEART.GENERAL.stress")}}: {{this.choices.stress}}</label>
-                <input type="range" step="1" min="0" max="{{this.resourceValue}}" value="{{this.choices.stress}}" name="choices.stress" data-choice="stress" />
+                <input type="range" step="1" min="0" max="{{this.maxStressValue}}" value="{{this.choices.stress}}" name="choices.stress" data-choice="stress" />
             </div>
         </div>