diff --git a/commands/info/message.js b/commands/info/message.js
index e56fa439..bdc643d3 100644
--- a/commands/info/message.js
+++ b/commands/info/message.js
@@ -21,10 +21,11 @@ module.exports = class MessageInfoCommand extends Command {
 	}
 
 	run(msg, { message }) {
+		const format = msg.author.avatar && msg.author.avatar.startsWith('a_') ? 'gif' : 'png';
 		const embed = new MessageEmbed()
 			.setColor(message.member ? message.member.displayHexColor : 0x00AE86)
-			.setThumbnail(message.author.displayAvatarURL({ format: 'png' }))
-			.setAuthor(msg.author.tag, msg.author.displayAvatarURL({ format: 'png' }))
+			.setThumbnail(message.author.displayAvatarURL({ format }))
+			.setAuthor(msg.author.tag, msg.author.displayAvatarURL({ format }))
 			.setDescription(message.content)
 			.setTimestamp(message.createdAt)
 			.setFooter(`ID: ${message.id}`)
diff --git a/commands/info/user.js b/commands/info/user.js
index f469dc4c..24999fb3 100644
--- a/commands/info/user.js
+++ b/commands/info/user.js
@@ -30,8 +30,9 @@ module.exports = class UserInfoCommand extends Command {
 	}
 
 	async run(msg, { user }) {
+		const format = msg.author.avatar && msg.author.avatar.startsWith('a_') ? 'gif' : 'png';
 		const embed = new MessageEmbed()
-			.setThumbnail(user.displayAvatarURL({ format: 'png' }))
+			.setThumbnail(user.displayAvatarURL({ format }))
 			.addField('❯ Name', user.tag, true)
 			.addField('❯ ID', user.id, true)
 			.addField('❯ Discord Join Date', moment.utc(user.createdAt).format('MM/DD/YYYY h:mm A'), true)
diff --git a/package.json b/package.json
index ea30b85e..26a1c1f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "93.1.1",
+	"version": "93.1.2",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {