diff --git a/src/k_waypoint.c b/src/k_waypoint.c
index fc9a7ce1d..1bc48b2a5 100644
--- a/src/k_waypoint.c
+++ b/src/k_waypoint.c
@@ -1807,7 +1807,10 @@ void K_AdjustWaypointsParameters (void)
 		){
 			if (
 					riser->type == MT_WAYPOINT_RISER &&
-					riser->spawnpoint->angle == waypointmobj->spawnpoint->angle
+					(
+						!( riser->spawnpoint->options & MTF_OBJECTSPECIAL ) ||
+						riser->spawnpoint->angle == waypointmobj->spawnpoint->angle
+					)
 			){
 				if (( riser->spawnpoint->options & MTF_AMBUSH ))
 				{