diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index f6bcb4da22..4aa5d6e735 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -102,6 +102,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
 	@ScheduleTarget
 	private void onVitalityReset()
 	{
+		if (!Config.ENABLE_VITALITY)
+		{
+			return;
+		}
+		
 		for (L2PcInstance player : L2World.getInstance().getPlayers())
 		{
 			player.setVitalityPoints(PcStat.MAX_VITALITY_POINTS, false);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 24a5e58b7f..2fc1234300 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -105,6 +105,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
 	@ScheduleTarget
 	private void onVitalityReset()
 	{
+		if (!Config.ENABLE_VITALITY)
+		{
+			return;
+		}
+		
 		for (L2PcInstance player : L2World.getInstance().getPlayers())
 		{
 			player.setVitalityPoints(PcStat.MAX_VITALITY_POINTS, false);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 24a5e58b7f..2fc1234300 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -105,6 +105,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
 	@ScheduleTarget
 	private void onVitalityReset()
 	{
+		if (!Config.ENABLE_VITALITY)
+		{
+			return;
+		}
+		
 		for (L2PcInstance player : L2World.getInstance().getPlayers())
 		{
 			player.setVitalityPoints(PcStat.MAX_VITALITY_POINTS, false);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 24a5e58b7f..2fc1234300 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -105,6 +105,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
 	@ScheduleTarget
 	private void onVitalityReset()
 	{
+		if (!Config.ENABLE_VITALITY)
+		{
+			return;
+		}
+		
 		for (L2PcInstance player : L2World.getInstance().getPlayers())
 		{
 			player.setVitalityPoints(PcStat.MAX_VITALITY_POINTS, false);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 24a5e58b7f..2fc1234300 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -105,6 +105,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
 	@ScheduleTarget
 	private void onVitalityReset()
 	{
+		if (!Config.ENABLE_VITALITY)
+		{
+			return;
+		}
+		
 		for (L2PcInstance player : L2World.getInstance().getPlayers())
 		{
 			player.setVitalityPoints(PcStat.MAX_VITALITY_POINTS, false);
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 24a5e58b7f..2fc1234300 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -105,6 +105,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
 	@ScheduleTarget
 	private void onVitalityReset()
 	{
+		if (!Config.ENABLE_VITALITY)
+		{
+			return;
+		}
+		
 		for (L2PcInstance player : L2World.getInstance().getPlayers())
 		{
 			player.setVitalityPoints(PcStat.MAX_VITALITY_POINTS, false);