diff --git a/src/p_map.cpp b/src/p_map.cpp
index fca43c120..c9b2f14cf 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -1013,6 +1013,10 @@ bool PIT_CheckThing(AActor *thing, FCheckPosition &tm)
 	bool 	solid;
 	int 	damage;
 
+	// don't clip against self
+	if (thing == tm.thing)
+		return true;
+
 	if (!((thing->flags & (MF_SOLID | MF_SPECIAL | MF_SHOOTABLE)) || thing->flags6 & MF6_TOUCHY))
 		return true;	// can't hit thing
 
@@ -1020,10 +1024,6 @@ bool PIT_CheckThing(AActor *thing, FCheckPosition &tm)
 	if (abs(thing->x - tm.x) >= blockdist || abs(thing->y - tm.y) >= blockdist)
 		return true;
 
-	// don't clip against self
-	if (thing == tm.thing)
-		return true;
-
 	if ((thing->flags2 | tm.thing->flags2) & MF2_THRUACTORS)
 		return true;