diff --git a/src/commands/coordinators/private.ts b/src/commands/coordinators/private.ts
index da89491..2395cb1 100644
--- a/src/commands/coordinators/private.ts
+++ b/src/commands/coordinators/private.ts
@@ -198,7 +198,7 @@ export class PrivateCommand extends Subcommand {
       .setColor(guildMember.displayHexColor)
       .setTitle(`Private channel for ${guildMember.user.username}`)
       .setDescription(`${guildMember}`)
-      .setThumbnail(guildMember.user.avatarURL()!)
+      .setThumbnail(guildMember.user.displayAvatarURL())
       .addFields(
         { name: 'Joined:', value: `${joinTime}`, inline: true },
         { name: 'Created:', value: `${registerTime}`, inline: true },
diff --git a/src/commands/mod/ban/ban.ts b/src/commands/mod/ban/ban.ts
index 3a4cdb7..c8a63fb 100644
--- a/src/commands/mod/ban/ban.ts
+++ b/src/commands/mod/ban/ban.ts
@@ -212,7 +212,7 @@ export class BanCommand extends Command {
 
     const log = new EmbedBuilder()
       .setColor('#FF0000')
-      .setAuthor({ name: `Banned ${user.tag}`, iconURL: `${user.avatarURL()}` })
+      .setAuthor({ name: `Banned ${user.tag}`, iconURL: `${user.displayAvatarURL()}` })
       .addFields(
         { name: 'User', value: `${user}`, inline: true },
         { name: 'Moderator', value: `${mod}`, inline: true },
diff --git a/src/commands/mod/ban/tempBan.ts b/src/commands/mod/ban/tempBan.ts
index 56e3459..1c44983 100644
--- a/src/commands/mod/ban/tempBan.ts
+++ b/src/commands/mod/ban/tempBan.ts
@@ -278,7 +278,7 @@ export class TempBanCommand extends Command {
 
     const log = new EmbedBuilder()
       .setColor('#FF0000')
-      .setAuthor({ name: `Temp Banned ${user.tag}`, iconURL: `${user.avatarURL()}` })
+      .setAuthor({ name: `Temp Banned ${user.tag}`, iconURL: `${user.displayAvatarURL()}` })
       .addFields(
         { name: 'User', value: `${user}`, inline: true },
         { name: 'Moderator', value: `${mod}`, inline: true },
diff --git a/src/commands/mod/ban/unban.ts b/src/commands/mod/ban/unban.ts
index 62bf738..cd0c998 100644
--- a/src/commands/mod/ban/unban.ts
+++ b/src/commands/mod/ban/unban.ts
@@ -204,7 +204,7 @@ export class UnbanCommand extends Command {
 
     const log = new EmbedBuilder()
       .setColor('#28A745')
-      .setAuthor({ name: `Unbanned ${user.tag}`, iconURL: `${user.avatarURL()}` })
+      .setAuthor({ name: `Unbanned ${user.tag}`, iconURL: `${user.displayAvatarURL()}` })
       .addFields(
         { name: 'User', value: `${user}`, inline: true },
         { name: 'Moderator', value: `${mod}`, inline: true },
diff --git a/src/commands/mod/restriction/restrict.ts b/src/commands/mod/restriction/restrict.ts
index 3810e8d..3925598 100644
--- a/src/commands/mod/restriction/restrict.ts
+++ b/src/commands/mod/restriction/restrict.ts
@@ -201,7 +201,7 @@ export async function restrictRun(
         .setColor(member.displayHexColor)
         .setTitle(`Restricted channel for ${member.user.username}`)
         .setDescription(`${member}`)
-        .setThumbnail(member.user.avatarURL()!)
+        .setThumbnail(member.user.displayAvatarURL())
         .addFields(
           { name: 'Joined:', value: `${joinTime}`, inline: true },
           { name: 'Created:', value: `${registerTime}`, inline: true },
@@ -251,7 +251,7 @@ export async function restrictRun(
 
   const message = new EmbedBuilder()
     .setColor('#FF6700')
-    .setAuthor({ name: `Restricted ${user.tag}`, iconURL: `${user.avatarURL()}` })
+    .setAuthor({ name: `Restricted ${user.tag}`, iconURL: `${user.displayAvatarURL()}` })
     .addFields(
       { name: 'User', value: `${user}`, inline: true },
       { name: 'Moderator', value: `${mod}`, inline: true },
diff --git a/src/commands/mod/restriction/restrictLogs.ts b/src/commands/mod/restriction/restrictLogs.ts
index 8d1a3c0..48c4a8a 100644
--- a/src/commands/mod/restriction/restrictLogs.ts
+++ b/src/commands/mod/restriction/restrictLogs.ts
@@ -197,7 +197,7 @@ export class RestrictLogsCommand extends Command {
     const embed = new EmbedBuilder()
       .setColor('#FF6700')
       .setTitle(`${restrictions.length} restrictions for ${user.tag}`)
-      .setThumbnail(user.avatarURL()!)
+      .setThumbnail(user.displayAvatarURL())
       .setFooter({ text: `ID: ${userId}` });
 
     // Add up to 10 of the latest restrictions to the embed
diff --git a/src/commands/mod/restriction/unrestrict.ts b/src/commands/mod/restriction/unrestrict.ts
index 42c3d86..98c2847 100644
--- a/src/commands/mod/restriction/unrestrict.ts
+++ b/src/commands/mod/restriction/unrestrict.ts
@@ -236,7 +236,7 @@ export class UnRestrictCommand extends Command {
 
     const message = new EmbedBuilder()
       .setColor('#28A745')
-      .setAuthor({ name: `Unrestricted ${user.tag}`, iconURL: `${user.avatarURL()}` })
+      .setAuthor({ name: `Unrestricted ${user.tag}`, iconURL: `${user.displayAvatarURL()}` })
       .addFields(
         { name: 'User', value: `${user}`, inline: true },
         { name: 'Moderator', value: `${mod}`, inline: true },
diff --git a/src/commands/mod/sus.ts b/src/commands/mod/sus.ts
index a733c6b..7f4bfff 100644
--- a/src/commands/mod/sus.ts
+++ b/src/commands/mod/sus.ts
@@ -207,7 +207,7 @@ export class SusCommand extends Subcommand {
     const noteEmbed = new EmbedBuilder()
       .setColor('#0099ff')
       .setTitle(`${notes.length} sus notes for ${user.username}`)
-      .setThumbnail(user.avatarURL()!);
+      .setThumbnail(user.displayAvatarURL());
 
     // Add up to 10 of the latest sus notes to the embed
     for (let i = notes.length > 10 ? notes.length - 10 : 0; i < notes.length; i += 1) {
@@ -402,7 +402,7 @@ export class SusCommand extends Subcommand {
     const noteEmbed = new EmbedBuilder()
       .setColor('#ff0000')
       .setTitle(`Delete ${notes.length} sus notes for ${user.username}?`)
-      .setThumbnail(user.avatarURL()!);
+      .setThumbnail(user.displayAvatarURL());
 
     // Add up to 10 of the latest sus notes to the embed
     for (let i = notes.length > 10 ? notes.length - 10 : 0; i < notes.length; i += 1) {
diff --git a/src/listeners/ban/ban.ts b/src/listeners/ban/ban.ts
index 4b9b745..df7768e 100644
--- a/src/listeners/ban/ban.ts
+++ b/src/listeners/ban/ban.ts
@@ -128,7 +128,7 @@ export class BanListener extends Listener {
 
     const log = new EmbedBuilder()
       .setColor('#FF0000')
-      .setAuthor({ name: `Banned ${user.tag} (not done via bot)`, iconURL: `${user.avatarURL()}` })
+      .setAuthor({ name: `Banned ${user.tag} (not done via bot)`, iconURL: `${user.displayAvatarURL()}` })
       .addFields(
         { name: 'User', value: `${user}`, inline: true },
         { name: 'Moderator', value: `${mod}`, inline: true },
diff --git a/src/listeners/ban/unban.ts b/src/listeners/ban/unban.ts
index bf2d8bd..30fb1aa 100644
--- a/src/listeners/ban/unban.ts
+++ b/src/listeners/ban/unban.ts
@@ -113,7 +113,7 @@ export class UnbanListener extends Listener {
 
     const log = new EmbedBuilder()
       .setColor('#28A745')
-      .setAuthor({ name: `Unbanned ${user.tag} (not done via bot)`, iconURL: `${user.avatarURL()}` })
+      .setAuthor({ name: `Unbanned ${user.tag} (not done via bot)`, iconURL: `${user.displayAvatarURL()}` })
       .addFields(
         { name: 'User', value: `${user}`, inline: true },
         { name: 'Moderator', value: `${mod}`, inline: true },
diff --git a/src/listeners/suggestions.ts b/src/listeners/suggestions.ts
index e993437..fbc46fe 100644
--- a/src/listeners/suggestions.ts
+++ b/src/listeners/suggestions.ts
@@ -46,7 +46,7 @@ export class Suggestions extends Listener {
 
     const suggestion = new EmbedBuilder()
       .setColor('#FFFFFF')
-      .setAuthor({ name: `Suggestion from ${message.author.tag}`, iconURL: `${message.author.avatarURL()}` })
+      .setAuthor({ name: `Suggestion from ${message.author.tag}`, iconURL: `${message.author.displayAvatarURL()}` })
       .addFields(
         { name: 'Suggestion:', value: message.content },
       )
diff --git a/src/listeners/verification/joinVC.ts b/src/listeners/verification/joinVC.ts
index b3c6ab0..c27472b 100644
--- a/src/listeners/verification/joinVC.ts
+++ b/src/listeners/verification/joinVC.ts
@@ -231,7 +231,7 @@ export class VerificationJoinVCListener extends Listener {
     const embed = new EmbedBuilder()
       .setColor(user.displayHexColor)
       .setTitle(`Information on ${user.user.username}`)
-      .setThumbnail(user.user.avatarURL()!)
+      .setThumbnail(user.user.displayAvatarURL())
       .addFields(
         { name: 'Joined:', value: `${joinTime}`, inline: true },
         { name: 'Created:', value: `${registerTime}`, inline: true },
@@ -461,7 +461,7 @@ export class VerificationJoinVCListener extends Listener {
         embed = new EmbedBuilder()
           .setColor('#34c000')
           .setTitle(`Successfully verified ${user.displayName}!`)
-          .setThumbnail(user.user.avatarURL()!)
+          .setThumbnail(user.user.displayAvatarURL())
           .addFields(
             { name: 'Roles:', value: this.getTextRoles(info.roles) },
           );
diff --git a/src/scheduled-tasks/tempBan.ts b/src/scheduled-tasks/tempBan.ts
index 1b49818..52927f2 100644
--- a/src/scheduled-tasks/tempBan.ts
+++ b/src/scheduled-tasks/tempBan.ts
@@ -82,7 +82,7 @@ export class TempBan extends ScheduledTask {
 
     const log = new EmbedBuilder()
       .setColor('#28A745')
-      .setAuthor({ name: `Unbanned ${user.tag} (tempban)`, iconURL: `${user.avatarURL()}` })
+      .setAuthor({ name: `Unbanned ${user.tag} (tempban)`, iconURL: `${user.displayAvatarURL()}` })
       .addFields(
         { name: 'User', value: `${user}`, inline: true },
       )