diff --git a/mesecons_doors/init.lua b/mesecons_doors/init.lua
index 420029a0..8b6b33cb 100644
--- a/mesecons_doors/init.lua
+++ b/mesecons_doors/init.lua
@@ -82,15 +82,6 @@ local function meseconify_door(name)
 	end
 end
 
-local doors_list = {
-	"doors:door_wood",
-	"doors:door_steel",
-	"doors:door_glass",
-	"doors:door_obsidian_glass",
-	"xpanes:door_steel_bar",
-}
-for i=1,#doors_list do meseconify_door(doors_list[i]) end
-
 -- Trapdoor
 local function trapdoor_switch(name)
 	return function(pos, node)
@@ -140,9 +131,15 @@ local function meseconify_trapdoor(name)
 	end
 end
 
-local trapdoors_list = {
-	"doors:trapdoor",
-	"doors:trapdoor_steel",
-	"xpanes:trapdoor_steel_bar"
-}
-for i=1,#trapdoors_list do meseconify_trapdoor(trapdoors_list[i]) end
+minetest.register_on_mods_loaded(function()
+	for k,_ in pairs(doors.registered_doors) do
+		if k:find("_a$") then
+			meseconify_door(k:sub(1,-3))
+		end
+	end
+	for k,_ in pairs(doors.registered_trapdoors) do
+		if not k:find("_open$") then
+			meseconify_trapdoor(k)
+		end
+	end
+end)