diff --git a/mods/ITEMS/mcl_armor_stand/init.lua b/mods/ITEMS/mcl_armor_stand/init.lua
index 5ebb8d621d..72436330aa 100644
--- a/mods/ITEMS/mcl_armor_stand/init.lua
+++ b/mods/ITEMS/mcl_armor_stand/init.lua
@@ -299,4 +299,13 @@ minetest.register_craft({
 	}
 })
 
+
+-- Legacy handling
 minetest.register_alias("3d_armor_stand:armor_stand", "mcl_armor_stand:armor_stand")
+minetest.register_entity(":3d_armor_stand:armor_entity", {
+	on_activate = function(self)
+		minetest.log("action", "[mcl_armor_stand] Removing legacy entity: 3d_armor_stand:armor_entity")
+		self.object:remove()
+	end,
+	static_save = false,
+})