diff --git a/src/p_trace.cpp b/src/p_trace.cpp
index 5041294bb..eae7d6fd6 100644
--- a/src/p_trace.cpp
+++ b/src/p_trace.cpp
@@ -637,7 +637,7 @@ cont:
 
 		case TRACE_Skip:
 			Results->HitType = TRACE_HitNone;
-			if (!special3dpass && (TraceFlags & TRACE_3DCallback))
+			if (!special3dpass && (TraceFlags & TRACE_3DCallback) && entersector->e->XFloor.ffloors.Size())
 				return LineCheck(in, dist, hit, true);
 			break;