diff --git a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java
index 4f22013..6665821 100644
--- a/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java
+++ b/src/tamagotchi-service/src/main/java/com/sap/tamagotchi/service/TamagotchiService.java
@@ -96,7 +96,7 @@ public class TamagotchiService {
         if (device == null) {
             return;
         }
-        String defunctMessage = String.format("Tamagotchi %s of %s passed away", device.getOwner(), device.getOwner());
+        String defunctMessage = String.format("Tamagotchi %s of %s passed away", device.getId(), device.getOwner());
         DefunctNotification defunctNotification = new DefunctNotification(defunctMessage);
         try {
             publisherService.publish(defunctNotification);