diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index cdd6a5036d..0ac6c7591f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index cdd6a5036d..0ac6c7591f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index cdd6a5036d..0ac6c7591f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index cdd6a5036d..0ac6c7591f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index cdd6a5036d..0ac6c7591f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index cdd6a5036d..0ac6c7591f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index 856d1cc4c8..58ed0d37a3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index 856d1cc4c8..58ed0d37a3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index 856d1cc4c8..58ed0d37a3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
index 856d1cc4c8..58ed0d37a3 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java
@@ -19,6 +19,7 @@ package handlers.skillconditionhandlers;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.ISkillCondition;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +32,6 @@ public class CanSummonSkillCondition implements ISkillCondition
 {
 	public CanSummonSkillCondition(StatsSet params)
 	{
-		
 	}
 	
 	@Override
@@ -47,7 +47,10 @@ public class CanSummonSkillCondition implements ISkillCondition
 		
 		if (player.hasServitors())
 		{
-			canSummon = false;
+			for (L2Summon summon : player.getServitors().values())
+			{
+				summon.unSummon(player);
+			}
 		}
 		else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
 		{