diff --git a/HealBot_Controller_Spells.lua b/HealBot_Controller_Spells.lua
index e48abc4..c1db686 100644
--- a/HealBot_Controller_Spells.lua
+++ b/HealBot_Controller_Spells.lua
@@ -873,7 +873,7 @@ function HealBot_GetShapeshiftForm()
       local icon,name,active = GetShapeshiftFormInfo(i);
       if active then
         -- Do not unshift from Tree of Life form
-
+        if icon and (string.find(string.lower(icon), "treeoflife") or string.find(string.lower(icon), "healingway")) then
           return nil;
         end
         return i;