diff --git a/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java b/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java
index 3f33251..9f0af7f 100644
--- a/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java
+++ b/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java
@@ -81,13 +81,13 @@ public class DiscordEventListener extends ListenerAdapter {
 	@Override
 	public void onGuildVoiceLeave(@NotNull GuildVoiceLeaveEvent event) {
 		super.onGuildVoiceLeave(event);
-		if (event.getMember().getUser().isBot()) return;
+		if (event.getMember().getUser().isBot() || event.getChannelLeft().getMembers().size() == 0) return;
 		
 		if (Resources.isGreetings_and_byebyes_on()) {
+			
 			String nameToPlay = event.getMember().getNickname();
 			nameToPlay = nameToPlay == null ? event.getMember().getUser().getName() : nameToPlay;
 			
-			if (event.getChannelLeft().getMembers().size() == 0) return;
 			YoshiBot.getInstance().sayTTS(Resources.getRandomByebye(nameToPlay), event.getChannelLeft());
 		}
 		if (!AudioPlayerListener.isPlayingTrack()) YoshiBot.getInstance().joinVoiceChannelWithMostMembers();