diff --git a/mods/ITEMS/mcl_bows/arrow.lua b/mods/ITEMS/mcl_bows/arrow.lua
index 10b7f6421b..ad4a3f30e4 100644
--- a/mods/ITEMS/mcl_bows/arrow.lua
+++ b/mods/ITEMS/mcl_bows/arrow.lua
@@ -114,8 +114,9 @@ local function damage_particles(pos, is_critical)
 end
 
 function ARROW_ENTITY.on_step(self, dtime)
-	-- ERROR: [#2523] THIS WILL CAUSE INVALID OBJECTREFS
 	mcl_burning.tick(self.object, dtime, self)
+	-- mcl_burning.tick may remove object immediately
+	if not self.object:get_pos() then return end
 
 	self._time_in_air = self._time_in_air + .001
 
diff --git a/mods/ITEMS/mcl_bows/rocket.lua b/mods/ITEMS/mcl_bows/rocket.lua
index e08db53239..e846937d0a 100644
--- a/mods/ITEMS/mcl_bows/rocket.lua
+++ b/mods/ITEMS/mcl_bows/rocket.lua
@@ -312,8 +312,9 @@ local function damage_particles(pos, is_critical)
 end
 
 function ARROW_ENTITY.on_step(self, dtime)
-	-- ERROR: [#2523] THIS WILL CAUSE INVALID OBJECTREFS
 	mcl_burning.tick(self.object, dtime, self)
+	-- mcl_burning.tick may remove object immediately
+	if not self.object:get_pos() then return end
 
 	self._time_in_air = self._time_in_air + .001