diff --git a/Source/Game/Handlers/GroupHandler.cs b/Source/Game/Handlers/GroupHandler.cs
index 533a11d35..15181eeab 100644
--- a/Source/Game/Handlers/GroupHandler.cs
+++ b/Source/Game/Handlers/GroupHandler.cs
@@ -285,7 +285,6 @@ namespace Game
             if (oldRole == packet.Role)
                 return;
 
-            roleChangedInform.PartyIndex = (byte)group.GetGroupCategory();
             roleChangedInform.From = GetPlayer().GetGUID();
             roleChangedInform.ChangedUnit = packet.TargetGUID;
             roleChangedInform.OldRole = oldRole;
@@ -293,6 +292,7 @@ namespace Game
 
             if (group != null)
             {
+                roleChangedInform.PartyIndex = (byte)group.GetGroupCategory();
                 group.BroadcastPacket(roleChangedInform, false);
                 group.SetLfgRoles(packet.TargetGUID, (LfgRoles)packet.Role);
             }