diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7a5aaf424..1b2065920 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11206,6 +11206,10 @@ void P_RemoveMobj(mobj_t *mobj)
 
 	P_SetTarget(&mobj->hnext, P_SetTarget(&mobj->hprev, NULL));
 
+	// clear the reference from the mapthing
+	if (mobj->spawnpoint)
+		mobj->spawnpoint->mobj = NULL;
+
 	R_RemoveMobjInterpolator(mobj);
 
 	// free block