diff --git a/src/p_things.cpp b/src/p_things.cpp
index f9d85c43fc..b7e3f058b8 100644
--- a/src/p_things.cpp
+++ b/src/p_things.cpp
@@ -718,19 +718,13 @@ int P_Thing_Warp(AActor *caller, AActor *reference, fixed_t xofs, fixed_t yofs,
 		if (flags & WARPF_TOFLOOR)
 		{
 			// set correct xy
-
-			caller->SetOrigin(
-				reference->x + xofs,
-				reference->y + yofs,
-				reference->z);
-
 			// now the caller's floorz should be appropriate for the assigned xy-position
 			// assigning position again with.
 			// extra unlink, link and environment calculation
 			caller->SetOrigin(
-				caller->x,
-				caller->y,
-				caller->floorz + zofs);
+				reference->x + xofs,
+				reference->y + yofs,
+				reference->floorz + zofs);
 		}
 		else
 		{