diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 1c40b6904..be31d8540 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1658,6 +1658,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		if($this->spawned){
 			$this->processMovement($tickDiff);
+			$this->motionX = $this->motionY = $this->motionZ = 0; //TODO: HACK! (Fixes player knockback being messed up)
 
 			Timings::$timerEntityBaseTick->startTiming();
 			$this->entityBaseTick($tickDiff);