diff --git a/src/p_teleport.cpp b/src/p_teleport.cpp
index a808cfb1c4..1995e58fae 100644
--- a/src/p_teleport.cpp
+++ b/src/p_teleport.cpp
@@ -477,7 +477,7 @@ bool EV_Teleport (int tid, int tag, line_t *line, int side, AActor *thing, bool
 			thing->momx = FixedMul(momx, c) - FixedMul(momy, s);
 			thing->momy = FixedMul(momy, c) + FixedMul(momx, s);
 		}
-		if ((momx | momy) == 0 && thing->player != NULL)
+		if ((momx | momy) == 0 && thing->player != NULL && thing->player->mo == thing)
 		{
 			thing->player->mo->PlayIdle ();
 		}