diff --git a/src/world/Entity.php b/src/world/Entity.php
index bd6d91ad3..61c63553c 100644
--- a/src/world/Entity.php
+++ b/src/world/Entity.php
@@ -315,6 +315,9 @@ class Entity extends Position{
 			}else{
 				$hasUpdate = true;
 			}
+			if(($this->player instanceof Player) and ($this->player->gamemode & 0x01) === CREATIVE){ //Remove fire effects in next tick
+				$this->fire = 1;
+			}
 		}
 		
 		$startX = (int) (round($this->x - 0.5) - 1);