diff --git a/src/p_map.c b/src/p_map.c
index bb56a50b1..82403b947 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -592,6 +592,9 @@ static void P_DoTailsCarry(player_t *sonic, player_t *tails)
 	if (!(tails->pflags & PF_CANCARRY))
 		return;
 
+	if (sonic->pflags & PF_FINISHED)
+		return;
+
 	if (tails->bot == 1)
 		return;