diff --git a/src/Player.php b/src/Player.php
index f164e86f2..c7bfb71b6 100644
--- a/src/Player.php
+++ b/src/Player.php
@@ -958,7 +958,7 @@ class Player{
 							if(($this->entity instanceof Entity) and $data["counter"] > $this->lastMovement){
 								$this->lastMovement = $data["counter"];
 								$speed = $this->entity->getSpeed();
-								if($this->blocked === true or ($speed > 6 and ($this->gamemode & 0x01) === 0x00) or $speed > 15 or $this->server->api->handle("player.move", $this->entity) === false){
+								if($this->blocked === true or ($this->server->api->getProperty("allow-flight") !== true and (($speed > 6 and ($this->gamemode & 0x01) === 0x00) or $speed > 15)) or $this->server->api->handle("player.move", $this->entity) === false){
 									if($this->lastCorrect instanceof Vector3){
 										$this->teleport($this->lastCorrect, $this->entity->yaw, $this->entity->pitch, false);
 									}