diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch
index 0ae465a1b8..31d20b147e 100644
--- a/nms-patches/PlayerList.patch
+++ b/nms-patches/PlayerList.patch
@@ -475,7 +475,7 @@
 +            cserver.getPluginManager().callEvent(respawnEvent);
 +
 +            location = respawnEvent.getRespawnLocation();
-+            entityplayer.reset();
++            if (!flag) entityplayer.reset(); // SPIGOT-4785
 +        } else {
 +            location.setWorld(server.getWorldServer(dimensionmanager).getWorld());
          }