diff --git a/nms-patches/PlayerConnectionUtils.patch b/nms-patches/PlayerConnectionUtils.patch
index 87aa731f40..3fe05f31aa 100644
--- a/nms-patches/PlayerConnectionUtils.patch
+++ b/nms-patches/PlayerConnectionUtils.patch
@@ -4,7 +4,7 @@
      public static <T extends PacketListener> void ensureMainThread(Packet<T> packet, T t0, IAsyncTaskHandler<?> iasynctaskhandler) throws CancelledPacketHandleException {
          if (!iasynctaskhandler.isMainThread()) {
              iasynctaskhandler.execute(() -> {
-+                if (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect) return; // CraftBukkit
++                if (MinecraftServer.getServer().isStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) return; // CraftBukkit, MC-142590
                  packet.a(t0);
              });
              throw CancelledPacketHandleException.INSTANCE;