diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java
index 4922d69b..799b3638 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java
@@ -26,6 +26,7 @@ import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.discord.listeners.ChannelListener;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.Webhook;
 import net.dv8tion.jda.api.entities.WebhookClient;
@@ -104,10 +105,16 @@ public class DiscordChannel extends Chatter.PlayerlessChatter {
                 return;
             }
 
-            String avatarUrl;
+            String avatarUrl = null;
             if (user.getDiscordId() != null) {
-                avatarUrl = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId()).complete().getEffectiveAvatarUrl();
-            } else {
+                Member member = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId())
+                        .onErrorMap(throwable -> null)
+                        .complete();
+                if (member != null) {
+                    avatarUrl = member.getEffectiveAvatarUrl();
+                }
+            }
+            if (avatarUrl == null) {
                 avatarUrl = DiscordBot.getInstance().getJda().getSelfUser().getAvatarUrl();
             }