diff --git a/modules/energytick.lua b/modules/energytick.lua
index 9f40046b..36913dcd 100644
--- a/modules/energytick.lua
+++ b/modules/energytick.lua
@@ -64,7 +64,10 @@ pfUI:RegisterModule("energytick", "vanilla:tbc", function()
       if this.mode == "MANA" and diff < 0 then
         this.target = 5
       elseif this.mode == "MANA" and diff > 0 then
-        if this.max ~= 5 and diff > (this.badtick and this.badtick * 1.2 or 5) then
+        if UnitMana("player") >= UnitManaMax("player") then
+          this.start = nil
+          this.spark:SetAlpha(0)
+        elseif this.max ~= 5 and diff > (this.badtick and this.badtick * 1.2 or 5) then
           this.target = 2
         else
           this.badtick = diff
@@ -89,6 +92,7 @@ pfUI:RegisterModule("energytick", "vanilla:tbc", function()
     if this.target then
       this.start, this.max = GetTime(), this.target
       this.target = nil
+      this.spark:SetAlpha(1)
     end
 
     if not this.start then
@@ -121,4 +125,4 @@ pfUI:RegisterModule("energytick", "vanilla:tbc", function()
     energytick.spark:SetWidth(C.unitframes.player.pheight + 5)
     hookUpdateConfig(pfUI.uf.player)
   end
-end)
+end)
\ No newline at end of file