diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
index e704424f2c..968a4edb47 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
@@ -482,12 +482,13 @@ public class Party extends AbstractPlayerGroup
 					}
 				}
 				
-				if (getLeader() != null)
+				final PlayerInstance leader = getLeader();
+				if (leader != null)
 				{
-					getLeader().setParty(null);
-					if (getLeader().isInDuel())
+					leader.setParty(null);
+					if (leader.isInDuel())
 					{
-						DuelManager.getInstance().onRemoveFromParty(getLeader());
+						DuelManager.getInstance().onRemoveFromParty(leader);
 					}
 				}
 				if (_positionBroadcastTask != null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
index b404a02da3..b7043dccd0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
@@ -495,14 +495,16 @@ public class Party extends AbstractPlayerGroup
 					}
 				}
 				
-				if (getLeader() != null)
+				final PlayerInstance leader = getLeader();
+				if (leader != null)
 				{
-					getLeader().setParty(null);
-					if (getLeader().isInDuel())
+					leader.setParty(null);
+					if (leader.isInDuel())
 					{
-						DuelManager.getInstance().onRemoveFromParty(getLeader());
+						DuelManager.getInstance().onRemoveFromParty(leader);
 					}
 				}
+				
 				if (_changeDistributionTypeRequestTask != null)
 				{
 					_changeDistributionTypeRequestTask.cancel(true);