diff --git a/bot.js b/bot.js
index 039877c..91af5b9 100644
--- a/bot.js
+++ b/bot.js
@@ -36,4 +36,36 @@ for(const file of eventFiles){
         client.on(event.name, (...args) => event.execute(...args, commands))
     }
 }
+client.on('guildCreate' , guild => {   
+    const guild_embed = new MessageEmbed()
+    .setColor('00FFFF')
+    .setTitle('New Guild!')
+    .setDescription(`Elpha has joined the server ${guild.name}`)
+    .addFields(
+        {name: 'Members:', value: `${guild.memberCount}`},
+        {name: 'Guild ID:', value: `${guild.id}`},
+        {name: 'Guild owner:', value: `> <@${guild.ownerId}> \`[${guild.ownerId}]\``},
+        {name: 'Total servers:', value: `${await client.guilds.cache.size}`},
+    )
+    .setThumbnail(guild.iconURL())
+    .setTimestamp()
+    client.channels.cache.get('919799899929841694').send({embeds: [guild_embed]})
+})
+client.on('guildDelete' , guild => {
+    if(guild.available){
+        const embed = new MessageEmbed()
+        .setColor('00FFFF')
+        .setTitle('Guild Left')
+        .setDescription(`Elpha has left the server ${guild.name}`)
+        .addFields(
+            {name: 'Members:', value: `${guild.memberCount}`},
+            {name: 'Guild ID:', value: `${guild.id}`},
+            {name: 'Guild owner:', value: `> <@${guild.ownerId}> \`[${guild.ownerId}]\``},
+            {name: 'Total servers:', value: `${await client.guilds.cache.size}`},
+        )
+        .setThumbnail(guild.iconURL())
+        .setTimestamp()
+        client.channels.cache.get('919799899929841694').send({embeds: [embed]})	
+    }
+})
 client.login(process.env.token)
diff --git a/events/guildCreate.js b/events/guildCreate.js
index a13bf59..bca34c7 100644
--- a/events/guildCreate.js
+++ b/events/guildCreate.js
@@ -39,19 +39,6 @@ module.exports = {
 		)
 		.setTimestamp()
 		channel.send({ embeds: [embed], components: [repo, ser, web] }).catch((err) => console.log(err))
-		const guild_embed = new MessageEmbed()
-    	.setColor('00FFFF')
-	    .setTitle('New Guild!')
-	    .setDescription(`Elpha has joined the server ${guild.name}`)
-		.addFields(
-			{name: 'Members:', value: `${guild.memberCount}`},
-			{name: 'Guild ID:', value: `${guild.id}`},
-			{name: 'Guild owner:', value: `> <@${guild.ownerId}> \`[${guild.ownerId}]\``},
-			{name: 'Total servers:', value: `${await client.guilds.cache.size}`},
-		)
-    	.setThumbnail(guild.iconURL())
-    	.setTimestamp()
-		client.channels.cache.get('919799899929841694').send({embeds: [guild_embed]})	
 		console.log(`Server joined: ${guild.name}`)
 	}
 }
diff --git a/events/guildDelete.js b/events/guildDelete.js
index 2df34e4..1abf88f 100644
--- a/events/guildDelete.js
+++ b/events/guildDelete.js
@@ -1,22 +1,8 @@
-const { MessageActionRow, MessageButton, MessageEmbed } = require('discord.js')
 module.exports = {
 	name: 'guildDelete',
 	async execute(guild, client) {
 		if(guild.available){
 			console.log(`Server left: ${guild.name}`)
-			const embed = new MessageEmbed()
-			.setColor('00FFFF')
-			.setTitle('Guild Left')
-			.setDescription(`Elpha has left the server ${guild.name}`)
-			.addFields(
-				{name: 'Members:', value: `${guild.memberCount}`},
-				{name: 'Guild ID:', value: `${guild.id}`},
-				{name: 'Guild owner:', value: `> <@${guild.ownerId}> \`[${guild.ownerId}]\``},
-				{name: 'Total servers:', value: `${await client.guilds.cache.size}`},
-			)
-			.setThumbnail(guild.iconURL())
-			.setTimestamp()
-			client.channels.cache.get('919799899929841694').send({embeds: [embed]})	
 		}
 	}
 }
\ No newline at end of file