diff --git a/ActionButton.lua b/ActionButton.lua
index 12a66c0..6f819df 100644
--- a/ActionButton.lua
+++ b/ActionButton.lua
@@ -273,6 +273,11 @@ local function updateFunc(self)
 			control:RunFor(frame, frame:GetAttribute("UpdateAutoAssist"))
 		]])
 	end
+
+	if not ActionHasRange(self.action) then
+		self.rangeTimer = nil
+		self.outOfRange = nil
+	end
 end
 
 hooksecurefunc("ActionButton_Update", updateFunc)