diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 70c881091..c0466fa66 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1760,6 +1760,23 @@ void cPlayer::UseEquippedItem(void)
 
 
 
+void cPlayer::TickBurning(cChunk & a_Chunk)
+{
+	// Don't burn in creative and stop burning in creative if necessary
+	if (!IsGameModeCreative())
+	{
+		super::TickBurning(a_Chunk);
+	}
+	else if (IsOnFire())
+	{
+		m_TicksLeftBurning = 0;
+		OnFinishedBurning();
+	}
+}
+
+
+
+
 
 void cPlayer::HandleFood(void)
 {
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 784aac327..925011c9c 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -475,6 +475,9 @@ protected:
 
 	/// Filters out damage for creative mode/friendly fire
 	virtual void DoTakeDamage(TakeDamageInfo & TDI) override;
+
+	/** Stops players from burning in creative mode */
+	virtual void TickBurning(cChunk & a_Chunk) override;
 	
 	/// Called in each tick to handle food-related processing
 	void HandleFood(void);