diff --git a/mods/ENTITIES/mobs_mc/5_spawn_abm_check.lua b/mods/ENTITIES/mobs_mc/5_spawn_abm_check.lua
index 35a3c3449..303feb1ad 100644
--- a/mods/ENTITIES/mobs_mc/5_spawn_abm_check.lua
+++ b/mods/ENTITIES/mobs_mc/5_spawn_abm_check.lua
@@ -1,10 +1,11 @@
 function mobs:spawn_abm_check(pos, node, name)
-	if (node.name == "air") then
+	-- Don't spawn monsters on mycelium
+	if (node.name == "mcl_core:mycelium" or node.name == "mcl_core:mycelium_snow") and minetest.registered_entities[name].type == "monster" then
 		return true
-	elseif (node.name == "mcl_core:mycelium" or node.name == "mcl_core:mycelium_snow") and minetest.registered_entities[name].type == "monster" then
-		return false
-	elseif minetest.get_item_group(node.name, "opaque") ~= 0 then
+	-- Spawn on opaque or liquid nodes
+	elseif minetest.get_item_group(node.name, "opaque") ~= 0 or minetest.registered_nodes[node.name].liquidtype ~= "none" then
 		return false
 	end
+	-- Reject everything else
 	return true
 end