diff --git a/paper-server/nms-patches/net/minecraft/server/network/PlayerConnection.patch b/paper-server/nms-patches/net/minecraft/server/network/PlayerConnection.patch
index 2a9927e4d8..74cb3af48b 100644
--- a/paper-server/nms-patches/net/minecraft/server/network/PlayerConnection.patch
+++ b/paper-server/nms-patches/net/minecraft/server/network/PlayerConnection.patch
@@ -495,9 +495,12 @@
                              double d12 = d8;
  
                              d7 = d0 - this.player.getX();
-@@ -945,6 +1199,69 @@
+@@ -943,8 +1197,71 @@
+ 
+                             this.player.absMoveTo(d0, d1, d2, f, f1);
                              if (!this.player.noPhysics && !this.player.isSleeping() && (flag2 && worldserver.noCollision(this.player, axisalignedbb) || this.isPlayerCollidingWithAnythingNew(worldserver, axisalignedbb))) {
-                                 this.teleport(d3, d4, d5, f, f1);
+-                                this.teleport(d3, d4, d5, f, f1);
++                                this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet(), false); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
                              } else {
 +                                // CraftBukkit start - fire PlayerMoveEvent
 +                                // Rest to old location first