diff --git a/src/g_game.c b/src/g_game.c
index 175e757ec..6f02fde3c 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1867,6 +1867,10 @@ void G_DoLoadLevel(boolean resetplayer)
 	if (gamestate == GS_INTERMISSION)
 		Y_EndIntermission();
 
+	// clear the target on map change, since the object will be invalidated
+	P_SetTarget(&ticcmd_ztargetfocus[0], NULL);
+	P_SetTarget(&ticcmd_ztargetfocus[1], NULL);
+
 	// cleanup
 	if (titlemapinaction == TITLEMAP_LOADING)
 	{