diff --git a/mods/ENTITIES/mcl_burning/init.lua b/mods/ENTITIES/mcl_burning/init.lua
index 672036c78..6f1b0ef0d 100644
--- a/mods/ENTITIES/mcl_burning/init.lua
+++ b/mods/ENTITIES/mcl_burning/init.lua
@@ -15,7 +15,7 @@ minetest.register_entity("mcl_burning:fire", {
 		pointable = false,
 		glow = -1,
 	},
-	
+
 	animation_frame = 0,
 	animation_timer = 0,
 	on_step = mcl_burning.fire_entity_step,
@@ -23,7 +23,9 @@ minetest.register_entity("mcl_burning:fire", {
 
 minetest.register_globalstep(function(dtime)
 	for _, player in pairs(minetest.get_connected_players()) do
-		mcl_burning.tick(player, dtime)
+		if player:get_meta():get_float("mcl_burning:burn_time") > 0 then
+			mcl_burning.tick(player, dtime)
+		end
 	end
 end)
 
diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua
index a4b7e5132..9182b11c6 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@@ -3447,7 +3447,7 @@ end
 -- main mob function
 local mob_step = function(self, dtime)
 
-	if not self.fire_resistant then
+	if not self.fire_resistant and self.mcl_burning_burn_time and self.mcl_burning_burn_time > 0 then
 		mcl_burning.tick(self.object, dtime)
 	end
 
@@ -3906,7 +3906,7 @@ minetest.register_entity(name, {
 		--default built in engine collision detection
 		self.object:set_properties({
 			collide_with_objects = false,
-		})	
+		})
 		return mob_activate(self, staticdata, def, dtime)
 	end,
 
diff --git a/settingtypes.txt b/settingtypes.txt
index bfda9b3ba..c5968a4c0 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -98,7 +98,7 @@ animated_chests (Animated chests) bool true
 3d_player_preview (3D Player preview) bool true
 
 # The maximum number of boss bars to simultaniously display on the screen
-max_bossbars (Maximum Boss bars) int 4
+max_bossbars (Maximum Boss bars) int 5
 
 [Experimental]
 # Whether ice is translucent. If disabled, ice is fully opaque.