diff --git a/src/playsim/p_enemy.cpp b/src/playsim/p_enemy.cpp
index d4e8e77ded..bb929f2707 100644
--- a/src/playsim/p_enemy.cpp
+++ b/src/playsim/p_enemy.cpp
@@ -269,9 +269,6 @@ int P_CheckMeleeRange (AActor* actor, double range)
 
 	double dist;
 		
-	if (!pl || (actor->Sector->Flags & SECF_NOATTACK))
-		return false;
-				
 	dist = actor->Distance2D (pl);
 	if (range < 0) range = actor->meleerange;
 
@@ -282,6 +279,9 @@ int P_CheckMeleeRange (AActor* actor, double range)
 	if (pl == actor->goal)
 		return true;
 
+	if (!pl || (actor->Sector->Flags & SECF_NOATTACK))
+		return false;
+
 	// [RH] Don't melee things too far above or below actor.
 	if (!(actor->flags5 & MF5_NOVERTICALMELEERANGE))
 	{