diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua
index 17938a7843..c6dfece022 100644
--- a/mods/ENTITIES/mobs_mc/enderman.lua
+++ b/mods/ENTITIES/mobs_mc/enderman.lua
@@ -31,12 +31,12 @@ minetest.register_entity("mobs_mc:ender_eyes", {
 	textures = {
 		"mobs_mc_enderman_eyes.png",
 	},
-	on_activate = function(self)
-		minetest.after(0.1, function()
+	on_step = function(self)
+		if self and self.object then
 			if not self.object:get_attach() then
 				self.object:remove()
 			end
-		end)
+		end
 	end,
 	glow = 50,
 })
diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua
index dd328e6dcb..66b4e28539 100644
--- a/mods/ENTITIES/mobs_mc/spider.lua
+++ b/mods/ENTITIES/mobs_mc/spider.lua
@@ -18,15 +18,6 @@ minetest.register_entity("mobs_mc:spider_eyes", {
 	textures = {
 		"mobs_mc_spider_eyes.png",
 	},
-	on_activate = function(self)
-		minetest.after(0.1, function()
-			if self and self.object then
-				if not self.object:get_attach() then
-					self.object:remove()
-				end
-			end
-		end)
-	end,
 	on_step = function(self)
 		if self and self.object then
 			if not self.object:get_attach() then