diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index b4cb5d16f..9629ccfe8 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -253,6 +253,7 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
 		}
 	}
 	if (message == nullptr) message = messagename;	// fallback to defaults if possible.
+	if (attacker == nullptr) attacker = self; // world
 	if (attacker->player == nullptr) attacker = self;	// for the message creation
 
 	if (message != NULL && message[0] == '$')