diff --git a/src/main/java/io/github/skippyall/minions/mixins/PlayerListMixin.java b/src/main/java/io/github/skippyall/minions/mixins/PlayerListMixin.java
index 9bb04ce..60c8be2 100644
--- a/src/main/java/io/github/skippyall/minions/mixins/PlayerListMixin.java
+++ b/src/main/java/io/github/skippyall/minions/mixins/PlayerListMixin.java
@@ -2,6 +2,7 @@ package io.github.skippyall.minions.mixins;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.authlib.GameProfile;
 import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
 import io.github.skippyall.minions.fakeplayer.NetHandlerPlayServerFake;
@@ -52,4 +53,11 @@ public class PlayerListMixin {
         }
         return original.call(minecraftServer, serverLevel, gameProfile, clientInformation);
     }
+
+    @WrapOperation(method = "onPlayerConnect", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V"))
+    public void noLoginMessage(PlayerManager instance, Text message, boolean overlay, Operation<Void> original, @Local(argsOnly = true) ServerPlayerEntity player) {
+        if(!(player instanceof MinionFakePlayer)) {
+            original.call(instance, message, overlay);
+        }
+    }
 }
diff --git a/src/main/java/io/github/skippyall/minions/mixins/ServerPlayNetworkHandlerMixin.java b/src/main/java/io/github/skippyall/minions/mixins/ServerPlayNetworkHandlerMixin.java
new file mode 100644
index 0000000..0696fa9
--- /dev/null
+++ b/src/main/java/io/github/skippyall/minions/mixins/ServerPlayNetworkHandlerMixin.java
@@ -0,0 +1,25 @@
+package io.github.skippyall.minions.mixins;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.skippyall.minions.fakeplayer.MinionFakePlayer;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ServerPlayNetworkHandler.class)
+public class ServerPlayNetworkHandlerMixin {
+    @Shadow
+    public ServerPlayerEntity player;
+
+    @WrapOperation(method = "cleanUp", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V"))
+    public void noLogoutMessage(PlayerManager instance, Text message, boolean overlay, Operation<Void> original) {
+        if(!(player instanceof MinionFakePlayer)) {
+            original.call(instance, message, overlay);
+        }
+    }
+}