diff --git a/src/main/java/com/l2jserver/datapack/custom/service/buffer/BufferService.java b/src/main/java/com/l2jserver/datapack/custom/service/buffer/BufferService.java
index fcd6dad200819a37cd4987f2f1c87482b5418f25..b1222a18f44d20e9f0c5fcbf8161d5ad31159423 100644
--- a/src/main/java/com/l2jserver/datapack/custom/service/buffer/BufferService.java
+++ b/src/main/java/com/l2jserver/datapack/custom/service/buffer/BufferService.java
@@ -516,7 +516,10 @@ public final class BufferService extends CustomServiceScript {
 		SystemMessage abortSysMsg = null;
 		AbstractBuffer buffer = null;
 		
-		if (isInsideAnyZoneOf(player, Configuration.bufferService().getForbidInZones())) {
+		if (player.isDead()) {
+			abortSysMsg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			abortSysMsg.addString("Buffer");
+		} else if (isInsideAnyZoneOf(player, Configuration.bufferService().getForbidInZones())) {
 			abortSysMsg = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
 			abortSysMsg.addString("Buffer");
 		} else if (Configuration.bufferService().getForbidInEvents() && ((player.getEventStatus() != null) || (player.getBlockCheckerArena() != -1) || player.isOnEvent() || player.isInOlympiadMode() || TvTEvent.isPlayerParticipant(player.getObjectId()))) {