diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h
index 0434e8947..fce0d3197 100644
--- a/common/eq_packet_structs.h
+++ b/common/eq_packet_structs.h
@@ -4816,6 +4816,7 @@ struct BuffIcon_Struct
 	uint8  all_buffs;
 	uint16 count;
 	uint8 type; // 0 = self buff window, 1 = self target window, 4 = group, 5 = PC, 7 = NPC
+	int32 tic_timer;
 	BuffIconEntry_Struct entries[0];
 };
 
diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp
index 251ce28a3..72d3b75de 100644
--- a/common/patches/rof.cpp
+++ b/common/patches/rof.cpp
@@ -458,7 +458,7 @@ namespace RoF
 		memset(__packet->pBuffer, 0, sz);
 
 		__packet->WriteUInt32(emu->entity_id);
-		__packet->WriteUInt32(0);		// PlayerID ?
+		__packet->WriteUInt32(emu->tic_timer);
 		__packet->WriteUInt8(emu->all_buffs);			// 1 indicates all buffs on the player (0 to add or remove a single buff)
 		__packet->WriteUInt16(emu->count);
 
diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp
index b1487b2a3..9f906f991 100644
--- a/common/patches/rof2.cpp
+++ b/common/patches/rof2.cpp
@@ -527,7 +527,7 @@ namespace RoF2
 		memset(__packet->pBuffer, 0, sz);
 
 		__packet->WriteUInt32(emu->entity_id);
-		__packet->WriteUInt32(0);		// PlayerID ?
+		__packet->WriteUInt32(emu->tic_timer);
 		__packet->WriteUInt8(emu->all_buffs);			// 1 indicates all buffs on the player (0 to add or remove a single buff)
 		__packet->WriteUInt16(emu->count);
 
diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp
index d5fdec0b1..43f0d4b63 100644
--- a/common/patches/sod.cpp
+++ b/common/patches/sod.cpp
@@ -2219,25 +2219,6 @@ namespace SoD
 			ptr += sizeof(uint32);
 			ptr += 1;
 		}
-		/*std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-
-		uint8 write_var8 = 1;
-		ss.write((const char*)&emu->entity_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint16));
-		write_var8 = 0;
-		for(uint16 i = 0; i < emu->count; ++i)
-		{
-		ss.write((const char*)&emu->entries[i].buff_slot, sizeof(uint32));
-		ss.write((const char*)&emu->entries[i].spell_id, sizeof(uint32));
-		ss.write((const char*)&emu->entries[i].tics_remaining, sizeof(uint32));
-		ss.write((const char*)&write_var8, sizeof(uint8));
-		}
-
-		__packet->size = ss.str().length();
-		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
-		*/
-
 		FINISH_ENCODE();
 	}
 
diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp
index a0bca8e69..e16fce125 100644
--- a/common/patches/uf.cpp
+++ b/common/patches/uf.cpp
@@ -391,7 +391,7 @@ namespace UF
 		memset(__packet->pBuffer, 0, sz);
 
 		__packet->WriteUInt32(emu->entity_id);
-		__packet->WriteUInt32(0);
+		__packet->WriteUInt32(emu->tic_timer);
 		__packet->WriteUInt8(emu->all_buffs); // 1 = all buffs, 0 = 1 buff
 		__packet->WriteUInt16(emu->count);
 
diff --git a/zone/spells.cpp b/zone/spells.cpp
index c48baa00d..d648ba027 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -5413,6 +5413,7 @@ void Client::SendBuffNumHitPacket(Buffs_Struct &buff, int slot)
 	bi->entity_id = GetID();
 	bi->count = 1;
 	bi->all_buffs = 0;
+	bi->tic_timer = tic_timer.GetRemainingTime();
 
 	bi->entries[0].buff_slot = slot;
 	bi->entries[0].spell_id = buff.spellid;
@@ -5493,6 +5494,7 @@ EQApplicationPacket *Mob::MakeBuffsPacket(bool for_target)
 	buff->entity_id = GetID();
 	buff->count = count;
 	buff->all_buffs = 1;
+	buff->tic_timer = tic_timer.GetRemainingTime();
 	// there are more types, the client doesn't seem to really care though. The others are also currently hard to fill in here ...
 	// (see comment in common/eq_packet_structs.h)
 	if (for_target)