diff --git a/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/CommandListener.java b/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java
similarity index 94%
rename from app/src/main/java/de/yannicpunktdee/yoshibot/listeners/CommandListener.java
rename to app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java
index ba60ea4..d01804f 100644
--- a/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/CommandListener.java
+++ b/app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap;
  *
  * @author Yannic Link
  */
-public class CommandListener extends ListenerAdapter {
+public class DiscordEventListener extends ListenerAdapter {
 	
 	/**
 	 * {@inheritDoc}
@@ -57,6 +57,8 @@ public class CommandListener extends ListenerAdapter {
 	public void onGuildVoiceJoin(@NotNull GuildVoiceJoinEvent event) {
 		super.onGuildVoiceJoin(event);
 
+		if(!Resources.isGreetings_and_byebyes_on()) return;
+
 		if(event.getMember().getUser().isBot()) return;
 
 		PlayCommand.play(
@@ -68,6 +70,8 @@ public class CommandListener extends ListenerAdapter {
 	public void onGuildVoiceLeave(@NotNull GuildVoiceLeaveEvent event) {
 		super.onGuildVoiceLeave(event);
 
+		if(!Resources.isGreetings_and_byebyes_on()) return;
+
 		if(event.getMember().getUser().isBot()) return;
 
 		PlayCommand.play(
diff --git a/app/src/main/java/de/yannicpunktdee/yoshibot/main/YoshiBot.java b/app/src/main/java/de/yannicpunktdee/yoshibot/main/YoshiBot.java
index 27a6cb5..7a4e338 100644
--- a/app/src/main/java/de/yannicpunktdee/yoshibot/main/YoshiBot.java
+++ b/app/src/main/java/de/yannicpunktdee/yoshibot/main/YoshiBot.java
@@ -10,7 +10,7 @@ import de.yannicpunktdee.yoshibot.audio.AudioSendHandlerImpl;
 import de.yannicpunktdee.yoshibot.command.YoshiCommandContext;
 import de.yannicpunktdee.yoshibot.command.YoshiCommandDistributor;
 import de.yannicpunktdee.yoshibot.listeners.CommandLine;
-import de.yannicpunktdee.yoshibot.listeners.CommandListener;
+import de.yannicpunktdee.yoshibot.listeners.DiscordEventListener;
 import de.yannicpunktdee.yoshibot.utils.Logger;
 import de.yannicpunktdee.yoshibot.utils.Resources;
 import de.yannicpunktdee.yoshibot.utils.SauceProvider;
@@ -81,7 +81,7 @@ public class YoshiBot {
 		jdaBuilder = JDABuilder.createDefault(Resources.getJdaBuilderString());
 		jdaBuilder.setAutoReconnect(true);
 
-		jdaBuilder.addEventListeners(new CommandListener());
+		jdaBuilder.addEventListeners(new DiscordEventListener());
 		
 		audioPlayerManager = new DefaultAudioPlayerManager();
 		audioPlayerManager.registerSourceManager(new LocalAudioSourceManager());