diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 92499d1a07..14bdf5eebc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14099,7 +14099,7 @@ public class PlayerInstance extends Playable
 	
 	public void stopAutoUseTask()
 	{
-		if ((_autoUseTask != null) && !_autoUseTask.isCancelled() && !_autoUseTask.isDone() && _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty())
+		if ((_autoUseTask != null) && !_autoUseTask.isCancelled() && !_autoUseTask.isDone())
 		{
 			_autoUseTask.cancel(true);
 			_autoUseTask = null;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java
index 342eb35fdc..7663a30aaf 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java
@@ -91,6 +91,14 @@ public class Disconnection
 		_client = getClient(client, player);
 		_player = getActiveChar(client, player);
 		
+		// Stop player tasks.
+		if (_player != null)
+		{
+			_player.stopTimedHuntingZoneTask();
+			_player.stopAutoPlayTask();
+			_player.stopAutoUseTask();
+		}
+		
 		// Anti Feed
 		AntiFeedManager.getInstance().onDisconnect(_client);
 		
@@ -116,9 +124,6 @@ public class Disconnection
 		{
 			if (_player != null)
 			{
-				_player.stopTimedHuntingZoneTask();
-				_player.stopAutoPlayTask();
-				_player.stopAutoUseTask();
 				_player.storeMe();
 			}
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0d4b1b3a03..cd67dec8b1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14045,7 +14045,7 @@ public class PlayerInstance extends Playable
 	
 	public void stopAutoUseTask()
 	{
-		if ((_autoUseTask != null) && !_autoUseTask.isCancelled() && !_autoUseTask.isDone() && _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty())
+		if ((_autoUseTask != null) && !_autoUseTask.isCancelled() && !_autoUseTask.isDone())
 		{
 			_autoUseTask.cancel(true);
 			_autoUseTask = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java
index a781dd8565..202f623df5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java
@@ -91,6 +91,14 @@ public class Disconnection
 		_client = getClient(client, player);
 		_player = getActiveChar(client, player);
 		
+		// Stop player tasks.
+		if (_player != null)
+		{
+			_player.stopTimedHuntingZoneTask();
+			_player.stopAutoPlayTask();
+			_player.stopAutoUseTask();
+		}
+		
 		// Anti Feed
 		AntiFeedManager.getInstance().onDisconnect(_client);
 		
@@ -116,9 +124,6 @@ public class Disconnection
 		{
 			if (_player != null)
 			{
-				_player.stopTimedHuntingZoneTask();
-				_player.stopAutoPlayTask();
-				_player.stopAutoUseTask();
 				_player.storeMe();
 			}
 		}