diff --git a/api/unitframes.lua b/api/unitframes.lua
index 72b2bd3b..762516e8 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -1090,15 +1090,11 @@ function pfUI.uf.OnUpdate()
     end
   end
 
-  -- Combat/Aggro/Range Indicators (separate throttle, works for all frames including player)
+  -- Combat/Aggro Indicators (separate throttle, works for all frames including player)
   if not this.lastCombatCheck then this.lastCombatCheck = GetTime() + 0.2 end
   if this.lastCombatCheck < GetTime() then
     this.lastCombatCheck = GetTime() + 0.2
     
-    -- Range Fading and Online/Offline State
-    pfUI.uf:RefreshUnitState(this)
-    pfUI.uf:RefreshIndicators(this)
-    
     if this.config.squareaggro == "1" and pfUI.api.UnitHasAggro(this.label .. this.id) > 0 then
       this.combat.tex:SetTexture(1,.2,0)
       this.combat:Show()
@@ -1392,7 +1388,7 @@ function pfUI.uf:RefreshUnitState(unit)
     unit.power.bar:SetMinMaxValues(0, 100, true)
     unit.hp.bar:SetValue(0)
     unit.power.bar:SetValue(0)
-  elseif (unit.label == "party" or unit.label == "raid") and unit.config.faderange == "1" and not pfUI.api.UnitInRange(unit.label .. unit.id, 4) and not unlock then
+  elseif unit.config.faderange == "1" and not pfUI.api.UnitInRange(unit.label .. unit.id, 4) and not unlock then
     alpha = unit.alpha_outrange
   end
 
diff --git a/modules/gui.lua b/modules/gui.lua
index 541196f8..c4f5b218 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -1749,9 +1749,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
         CreateConfig(U[c], T["Default Transparency"], C.unitframes[c], "alpha_visible", "dropdown", pfUI.gui.dropdowns.percent_small)
         CreateConfig(U[c], T["Out Of Range Transparency"], C.unitframes[c], "alpha_outrange", "dropdown", pfUI.gui.dropdowns.percent_small)
         CreateConfig(U[c], T["Offline Transparency"], C.unitframes[c], "alpha_offline", "dropdown", pfUI.gui.dropdowns.percent_small)
-        if c == "group" or c == "raid" then
-          CreateConfig(U[c], T["Enable Range Fading"], C.unitframes[c], "faderange", "checkbox")
-        end
+        CreateConfig(U[c], T["Enable Range Fading"], C.unitframes[c], "faderange", "checkbox")
         CreateConfig(U[c], T["Enable Aggro Glow"], C.unitframes[c], "glowaggro", "checkbox")
         CreateConfig(U[c], T["Enable Combat Glow"], C.unitframes[c], "glowcombat", "checkbox")
         CreateConfig(U[c], T["Portrait Position"], C.unitframes[c], "portrait", "dropdown", pfUI.gui.dropdowns.uf_portrait_position)