diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index eaffc4f77f..5862509e8f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -183,6 +184,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index eaffc4f77f..5862509e8f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -183,6 +184,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index eaffc4f77f..5862509e8f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -183,6 +184,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index eaffc4f77f..5862509e8f 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -183,6 +184,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index eaffc4f77f..5862509e8f 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -183,6 +184,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1e5709df8a..ee9c80000b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -183,6 +184,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 7eaf6f154f..21f0e8f7ab 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -184,6 +185,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 7eaf6f154f..21f0e8f7ab 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -184,6 +185,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 7eaf6f154f..21f0e8f7ab 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -184,6 +185,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 7eaf6f154f..21f0e8f7ab 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro;
@@ -184,6 +185,19 @@ public class AutoPlayTaskManager implements Runnable
 	public void stopAutoPlay(Player player)
 	{
 		PLAYERS.remove(player);
+		
+		// Pets must follow their owner.
+		if (player.hasServitors())
+		{
+			for (Summon summon : player.getServitors().values())
+			{
+				summon.followOwner();
+			}
+		}
+		if (player.hasPet())
+		{
+			player.getPet().followOwner();
+		}
 	}
 	
 	public boolean isAutoPlay(Player player)