diff --git a/addons/GearSwap/packet_parsing.lua b/addons/GearSwap/packet_parsing.lua
index 0eafd2c7d..568c35e2a 100644
--- a/addons/GearSwap/packet_parsing.lua
+++ b/addons/GearSwap/packet_parsing.lua
@@ -518,10 +518,7 @@ parse.i[0x063] = function (data)
                     end
                     local buff_name = res.buffs[new.id][language]
                     windower.debug('refresh buff '..buff_name..' ('..tostring(new.id)..')')
-                    if not gearswap_disabled then
-                        refresh_globals()
-                        equip_sets('buff_refresh',nil,buff_name,new)
-                    end
+                    batch:append({name=buff_name,refresh=true,tab=new})                    
                 else
                     -- Not matched, so it's assumed the buff is new
                     if not res.buffs[new.id] then
@@ -556,7 +553,11 @@ parse.i[0x063] = function (data)
             if not gearswap_disabled and #batch > 0 then
                 refresh_globals()
                 for v,_ in batch:it() do
-                    equip_sets('buff_change',nil,v.name,v.gain,v.tab)
+                    if v.refresh then
+                        equip_sets('buff_refresh',nil,v.name,v.tab)
+                    else
+                        equip_sets('buff_change',nil,v.name,v.gain,v.tab)
+                    end
                 end
             end
         end
@@ -772,7 +773,6 @@ function initialize_packet_parsing()
     end
     
     table.sort(lastpackets, function(t1, t2) return t1.ts < t2.ts end)
-    
     for _,p in ipairs(lastpackets) do
         parse.i[p.id](p.data)
     end