diff --git a/events/Guild/guildCreate.js b/events/Guild/guildCreate.js
index 1981bfb2..3fa92589 100644
--- a/events/Guild/guildCreate.js
+++ b/events/Guild/guildCreate.js
@@ -48,7 +48,7 @@ class GuildCreate extends BaseEvent {
 			const embed = client.embed({
 				author: {
 					name: guild.name,
-					iconURL: guild.iconURL(),
+					iconURL: guild.iconURL() || client.user.avatarURL(),
 				},
 				description: `Joined a new guild **${guild.name}**. It has **${users}** ${client.functions.getNoun(users, client.translate("misc:NOUNS:USERS:1"), client.translate("misc:NOUNS:USERS:2"), client.translate("misc:NOUNS:USERS:5"))} and **${bots}** ${client.functions.getNoun(bots, client.translate("misc:NOUNS:BOTS:1"), client.translate("misc:NOUNS:BOTS:2"), client.translate("misc:NOUNS:BOTS:5"))}`,
 			});
diff --git a/events/Guild/guildDelete.js b/events/Guild/guildDelete.js
index c6013f3e..15041b14 100644
--- a/events/Guild/guildDelete.js
+++ b/events/Guild/guildDelete.js
@@ -18,7 +18,7 @@ class GuildDelete extends BaseEvent {
 			const embed = client.embed({
 				author: {
 					name: guild.name,
-					iconURL: guild.iconURL(),
+					iconURL: guild.iconURL() || client.user.avatarURL(),
 				},
 				description: `Left from guild **${guild.name}**.`,
 			});