diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index f466d833b7..44188b0954 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index f466d833b7..44188b0954 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 523e628e84..f4a0d53d22 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 523e628e84..f4a0d53d22 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 954cb611aa..c8b75cd490 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 954cb611aa..c8b75cd490 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 954cb611aa..c8b75cd490 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 3350da98b0..fbf3cd1774 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 718bda3868..cb82af5094 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 718bda3868..cb82af5094 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c767625d9d..798aca04b3 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6f01ea6e2e..3fcd0ba9e5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6f01ea6e2e..3fcd0ba9e5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index f36e865a04..d10f8fe663 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ab9cbb9ad3..77cea33c41 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2539,9 +2539,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ab9cbb9ad3..77cea33c41 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2539,9 +2539,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index bbf825d5a8..e113d2bd68 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2539,9 +2539,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6f01ea6e2e..3fcd0ba9e5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2538,9 +2538,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 38b42569e5..0fbc248804 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2542,9 +2542,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 06fcb2729c..c58d369baf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2549,9 +2549,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 9c893b204a..9bfdf305d0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2549,9 +2549,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 */
 	public void stopTransformation(boolean removeEffects)
 	{
-		if (removeEffects)
+		if (removeEffects && !_effectList.stopEffects(AbnormalType.TRANSFORM))
 		{
-			_effectList.stopEffects(AbnormalType.TRANSFORM);
 			_effectList.stopEffects(AbnormalType.CHANGEBODY);
 		}
 		
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index d66c2d38c1..c8be7452d5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -383,8 +383,10 @@ public class Transform implements IIdentifiable
 				
 				player.sendPacket(ExBasicActionList.STATIC_PACKET);
 				
-				player.getEffectList().stopEffects(AbnormalType.TRANSFORM);
-				player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				if (!player.getEffectList().stopEffects(AbnormalType.TRANSFORM))
+				{
+					player.getEffectList().stopEffects(AbnormalType.CHANGEBODY);
+				}
 				
 				if (hasTransformSkills)
 				{