diff --git a/src/objects/wpzturbine.c b/src/objects/wpzturbine.c
index 5d86146e5..66c76dcde 100644
--- a/src/objects/wpzturbine.c
+++ b/src/objects/wpzturbine.c
@@ -206,7 +206,7 @@ void Obj_playerWPZTurbine(player_t *p)
 	fixed_t momz;
 
 
-	if (!t || P_MobjWasRemoved(t) || p->respawn.state != RESPAWNST_NONE)
+	if (!t || P_MobjWasRemoved(t) || t->type != MT_WATERPALACETURBINE || !t->spawnpoint || p->respawn.state != RESPAWNST_NONE)
 	{
 		p->turbine = false;
 		P_SetTarget(&pmo->tracer, NULL);