diff --git a/src/main/java/com/artillexstudios/axkills/listeners/DeathListener.java b/src/main/java/com/artillexstudios/axkills/listeners/DeathListener.java
index 50eb765..89e0493 100644
--- a/src/main/java/com/artillexstudios/axkills/listeners/DeathListener.java
+++ b/src/main/java/com/artillexstudios/axkills/listeners/DeathListener.java
@@ -18,14 +18,15 @@ public void onDeath(@NotNull PlayerDeathEvent event) {
         final Player player = event.getEntity();
 
         String msg;
+        boolean isKillMessage = false;
 
         if (player.getKiller() != null) {
             final Player killer = player.getKiller();
+            isKillMessage = true;
 
             msg = CONFIG.getString("death-messages.KILLED");
             msg = msg.replace("%attacker%", killer.getName());
             msg = msg.replace("%victim%", player.getName());
-            msg = msg.replace("%item%", Utils.setItem(killer));
 
             StringBuilder finalTxt = new StringBuilder();
             String[] message = msg.split("");
@@ -60,6 +61,7 @@ public void onDeath(@NotNull PlayerDeathEvent event) {
             }
 
             msg = finalTxt.toString();
+            msg = msg.replace("%item%", Utils.setItem(killer));
 
         } else if (event.getEntity().getLastDamageCause() != null && CONFIG.isString("death-messages." + event.getEntity().getLastDamageCause().getCause())) {
             msg = CONFIG.getString("death-messages." + event.getEntity().getLastDamageCause().getCause());
@@ -68,7 +70,10 @@ public void onDeath(@NotNull PlayerDeathEvent event) {
         }
 
         msg = msg.replace("%victim%", player.getName());
-        msg = Utils.setPlaceholders(player, msg);
+
+        if (!isKillMessage) {
+            msg = Utils.setPlaceholders(player, msg);
+        }
 
         event.setDeathMessage(ColorUtils.format(msg));
     }