diff --git a/src/main/java/me/drex/vanish/mixin/PlayerListMixin.java b/src/main/java/me/drex/vanish/mixin/PlayerListMixin.java
index 2da9d0d..10564c6 100644
--- a/src/main/java/me/drex/vanish/mixin/PlayerListMixin.java
+++ b/src/main/java/me/drex/vanish/mixin/PlayerListMixin.java
@@ -6,6 +6,7 @@
 import eu.pb4.playerdata.api.PlayerDataApi;
 import me.drex.vanish.api.VanishAPI;
 import me.drex.vanish.api.VanishEvents;
+import me.drex.vanish.config.ConfigManager;
 import me.drex.vanish.util.Arguments;
 import me.drex.vanish.util.VanishData;
 import me.drex.vanish.util.VanishedEntity;
@@ -61,7 +62,9 @@ private void vanishOnJoin(Connection connection, ServerPlayer actor, CommonListe
     )
     public void hideJoinMessage(PlayerList playerList, Component component, boolean bl, Operation<Void> original, Connection connection, ServerPlayer actor) {
         if (VanishAPI.isVanished(actor)) {
-            VanishAPI.broadcastHiddenMessage(actor, component);
+            if (ConfigManager.vanish().sendJoinDisconnectMessage) {
+                VanishAPI.broadcastHiddenMessage(actor, component);
+            }
         } else {
             original.call(playerList, component, bl);
         }
diff --git a/src/main/java/me/drex/vanish/mixin/ServerGamePacketListenerImplMixin.java b/src/main/java/me/drex/vanish/mixin/ServerGamePacketListenerImplMixin.java
index 5602190..97771ba 100644
--- a/src/main/java/me/drex/vanish/mixin/ServerGamePacketListenerImplMixin.java
+++ b/src/main/java/me/drex/vanish/mixin/ServerGamePacketListenerImplMixin.java
@@ -3,6 +3,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import me.drex.vanish.api.VanishAPI;
+import me.drex.vanish.config.ConfigManager;
 import me.drex.vanish.util.Arguments;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ServerboundInteractPacket;
@@ -35,7 +36,9 @@ public abstract class ServerGamePacketListenerImplMixin {
     )
     public void hideLeaveMessage(PlayerList playerList, Component component, boolean bl, Operation<Void> original) {
         if (VanishAPI.isVanished(this.player)) {
-            VanishAPI.broadcastHiddenMessage(this.player, component);
+            if (ConfigManager.vanish().sendJoinDisconnectMessage) {
+                VanishAPI.broadcastHiddenMessage(this.player, component);
+            }
         } else {
             original.call(playerList, component, bl);
         }