diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java
index 9f8d1eb769..e569522817 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java
@@ -27,6 +27,8 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.serverpackets.enchant.EnchantResult;
+import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantScrollItemResult;
 import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult;
 import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList;
 
@@ -70,11 +72,13 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
 		}
 		
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
-		if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
+		if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel()))
 		{
 			player.sendPacket(SystemMessageId.DOES_NOT_FIT_STRENGTHENING_CONDITIONS_OF_THE_SCROLL);
-			player.removeRequest(request.getClass());
+			request.setEnchantingItem(0);
 			player.sendPacket(new ExPutEnchantTargetItemResult(0));
+			player.sendPacket(new EnchantResult(2, 0, 0));
+			player.sendPacket(new ExPutEnchantScrollItemResult(1));
 			if (scrollTemplate == null)
 			{
 				PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId());
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java
index 9f8d1eb769..e569522817 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java
@@ -27,6 +27,8 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+import org.l2jmobius.gameserver.network.serverpackets.enchant.EnchantResult;
+import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantScrollItemResult;
 import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult;
 import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList;
 
@@ -70,11 +72,13 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
 		}
 		
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
-		if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null))
+		if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel()))
 		{
 			player.sendPacket(SystemMessageId.DOES_NOT_FIT_STRENGTHENING_CONDITIONS_OF_THE_SCROLL);
-			player.removeRequest(request.getClass());
+			request.setEnchantingItem(0);
 			player.sendPacket(new ExPutEnchantTargetItemResult(0));
+			player.sendPacket(new EnchantResult(2, 0, 0));
+			player.sendPacket(new ExPutEnchantScrollItemResult(1));
 			if (scrollTemplate == null)
 			{
 				PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId());