diff --git a/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch
index 2216f2d28a..7069eadc65 100644
--- a/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch
@@ -91,7 +91,7 @@ index 0000000000..350410527b
 +
 +    private StandardPaperServerListPingEventImpl(MinecraftServer server, NetworkManager networkManager, ServerPing ping) {
 +        super(server, new PaperStatusClient(networkManager), ping.getServerData().getProtocolVersion(), server.server.getServerIcon());
-+        this.originalSample = ping.getPlayers().getSample();
++        this.originalSample = ping.getPlayers() == null ? null : ping.getPlayers().getSample(); // GH-1473 - pre-tick race condition NPE
 +    }
 +
 +    @Nonnull