diff --git a/XIVSlothCombo/Data/CooldownData.cs b/XIVSlothCombo/Data/CooldownData.cs
index 8e2387462..5369f0ca5 100644
--- a/XIVSlothCombo/Data/CooldownData.cs
+++ b/XIVSlothCombo/Data/CooldownData.cs
@@ -1,6 +1,5 @@
using FFXIVClientStructs.FFXIV.Client.Game;
using System;
-using XIVSlothCombo.Services;
namespace XIVSlothCombo.Data
{
@@ -35,7 +34,16 @@ public bool IsCooldown
public bool HasCharges => MaxCharges > 1;
/// Gets the remaining number of charges for an action.
- public unsafe uint RemainingCharges => ActionManager.Instance()->GetCurrentCharges(ActionID);
+ public unsafe uint RemainingCharges
+ {
+ get
+ {
+ if (MaxCharges == 1)
+ return CooldownRemaining == 0 ? 1 : 0u;
+
+ return ActionManager.Instance()->GetCurrentCharges(ActionID);
+ }
+ }
/// Gets the cooldown time remaining until the next charge.
public float ChargeCooldownRemaining