diff --git a/src/games/kill.js b/src/games/kill.js
index 0cf5824..3025816 100755
--- a/src/games/kill.js
+++ b/src/games/kill.js
@@ -15,16 +15,14 @@ function onCommand(args, context) {
 		}
 	}
 
-	if (context.platform === 'irc') {
-		Object.keys(context.bot.rooms).forEach((roomId) => {
-			context.sendMessage(`Kill command used by ${style.bold(context.user.username)}, shutting down... :sleeping:`, roomId, { type: 'message', label: false });
+	if (config.platform === 'irc') {
+		context.bot.rooms.forEach((room) => {
+			context.sendMessage(`Kill command used by ${style.bold(context.user.username)}, shutting down... 😴`, room.id, { type: 'message', label: false });
 		});
 
 		if (context.room.id === config.user.id) {
 			// if the room ID is the bot's own nickname, it's a PM and we should reply to the sender
-			context.sendMessage('Shutting down... 😴', context.user.id, { label: false });
-		} else {
-			context.sendMessage('Shutting down... 😴', context.room?.id, { type: 'message', label: false });
+			context.sendMessage('Shutting down... 😴', context.user.id, { type: 'message', label: false }, context.message.user.username);
 		}
 	}