diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp
index b55989c971..2670ead2cb 100644
--- a/src/p_maputl.cpp
+++ b/src/p_maputl.cpp
@@ -1980,6 +1980,10 @@ int P_VanillaPointOnDivlineSide(fixed_t x, fixed_t y, const divline_t* line)
 
 sector_t *P_PointInSectorBuggy(fixed_t x, fixed_t y)
 {
+	// single subsector is a special case
+	if (numgamenodes == 0)
+		return gamesubsectors->sector;
+
 	node_t *node = gamenodes + numgamenodes - 1;
 
 	do