diff --git a/src/p_mobj.c b/src/p_mobj.c
index 2e6db0f71..48ac8a266 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2312,7 +2312,7 @@ boolean P_ZMovement(mobj_t *mo)
 			break;
 
 		case MT_EMERALD:
-			if (P_CheckDeathPitCollide(mo))
+			if (!(mo->flags & MF_NOCLIPHEIGHT) && P_CheckDeathPitCollide(mo))
 			{
 				P_RemoveMobj(mo);
 				return false;