diff --git a/commands/info/message.js b/commands/info/message.js
index bdc643d3..03c62737 100644
--- a/commands/info/message.js
+++ b/commands/info/message.js
@@ -21,7 +21,7 @@ module.exports = class MessageInfoCommand extends Command {
 	}
 
 	run(msg, { message }) {
-		const format = msg.author.avatar && msg.author.avatar.startsWith('a_') ? 'gif' : 'png';
+		const format = message.author.avatar && message.author.avatar.startsWith('a_') ? 'gif' : 'png';
 		const embed = new MessageEmbed()
 			.setColor(message.member ? message.member.displayHexColor : 0x00AE86)
 			.setThumbnail(message.author.displayAvatarURL({ format }))
diff --git a/commands/info/user.js b/commands/info/user.js
index 24999fb3..8e7d5dc8 100644
--- a/commands/info/user.js
+++ b/commands/info/user.js
@@ -30,7 +30,7 @@ module.exports = class UserInfoCommand extends Command {
 	}
 
 	async run(msg, { user }) {
-		const format = msg.author.avatar && msg.author.avatar.startsWith('a_') ? 'gif' : 'png';
+		const format = user.avatar && user.avatar.startsWith('a_') ? 'gif' : 'png';
 		const embed = new MessageEmbed()
 			.setThumbnail(user.displayAvatarURL({ format }))
 			.addField('❯ Name', user.tag, true)