diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index 4a25e54d51..770aa69151 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -52,4 +52,9 @@ public class AutoUseSettingsHolder
 	{
 		return _autoActions;
 	}
+	
+	public boolean isEmpty()
+	{
+		return _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty();
+	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 955def137f..dcadd9fc3f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -263,7 +263,10 @@ public class AutoUseTaskManager
 	
 	public void stopAutoUseTask(PlayerInstance player)
 	{
-		PLAYERS.remove(player);
+		if (player.getAutoUseSettings().isEmpty() || !player.isOnline() || player.isInOfflineMode())
+		{
+			PLAYERS.remove(player);
+		}
 	}
 	
 	public void addAutoSupplyItem(PlayerInstance player, int itemId)
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index 4a25e54d51..770aa69151 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -52,4 +52,9 @@ public class AutoUseSettingsHolder
 	{
 		return _autoActions;
 	}
+	
+	public boolean isEmpty()
+	{
+		return _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty();
+	}
 }
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 955def137f..dcadd9fc3f 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -263,7 +263,10 @@ public class AutoUseTaskManager
 	
 	public void stopAutoUseTask(PlayerInstance player)
 	{
-		PLAYERS.remove(player);
+		if (player.getAutoUseSettings().isEmpty() || !player.isOnline() || player.isInOfflineMode())
+		{
+			PLAYERS.remove(player);
+		}
 	}
 	
 	public void addAutoSupplyItem(PlayerInstance player, int itemId)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index 4a25e54d51..770aa69151 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -52,4 +52,9 @@ public class AutoUseSettingsHolder
 	{
 		return _autoActions;
 	}
+	
+	public boolean isEmpty()
+	{
+		return _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty();
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 955def137f..dcadd9fc3f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -263,7 +263,10 @@ public class AutoUseTaskManager
 	
 	public void stopAutoUseTask(PlayerInstance player)
 	{
-		PLAYERS.remove(player);
+		if (player.getAutoUseSettings().isEmpty() || !player.isOnline() || player.isInOfflineMode())
+		{
+			PLAYERS.remove(player);
+		}
 	}
 	
 	public void addAutoSupplyItem(PlayerInstance player, int itemId)
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index 4a25e54d51..770aa69151 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -52,4 +52,9 @@ public class AutoUseSettingsHolder
 	{
 		return _autoActions;
 	}
+	
+	public boolean isEmpty()
+	{
+		return _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty();
+	}
 }
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 955def137f..dcadd9fc3f 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -263,7 +263,10 @@ public class AutoUseTaskManager
 	
 	public void stopAutoUseTask(PlayerInstance player)
 	{
-		PLAYERS.remove(player);
+		if (player.getAutoUseSettings().isEmpty() || !player.isOnline() || player.isInOfflineMode())
+		{
+			PLAYERS.remove(player);
+		}
 	}
 	
 	public void addAutoSupplyItem(PlayerInstance player, int itemId)