diff --git a/src/units/udisplay.cpp b/src/units/udisplay.cpp
index 61fb373d870c..440e7e3e0a68 100644
--- a/src/units/udisplay.cpp
+++ b/src/units/udisplay.cpp
@@ -80,6 +80,7 @@ void teleport_unit_between(const map_location& a, const map_location& b, unit& t
 	const bool a_visible = temp_unit.is_visible_to_team(a, viewing_team, false);
 	const bool b_visible = temp_unit.is_visible_to_team(b, viewing_team, false);
 
+	temp_unit.set_location(a);
 	if ( a_visible ) { // teleport
 		disp.invalidate(a);
 		temp_unit.set_facing(a.get_relative_dir(b));
@@ -93,6 +94,7 @@ void teleport_unit_between(const map_location& a, const map_location& b, unit& t
 		animator.wait_for_end();
 	}
 
+	temp_unit.set_location(b);
 	if ( b_visible ) { // teleport
 		disp.invalidate(b);
 		temp_unit.set_facing(a.get_relative_dir(b));