diff --git a/lib/Travel/Status/DE/HAFAS/Journey.pm b/lib/Travel/Status/DE/HAFAS/Journey.pm
index dbe708e857ba104bfb4321bf751a85fb68062563..7be84108fd2680533e686f23d785229f48611832 100644
--- a/lib/Travel/Status/DE/HAFAS/Journey.pm
+++ b/lib/Travel/Status/DE/HAFAS/Journey.pm
@@ -166,7 +166,13 @@ sub new {
 	}
 
 	if ( $journey->{stbStop} ) {
-		shift(@stops);
+		if ( $hafas->{arrivals} ) {
+			$route_end = $stops[0]->{name};
+			pop(@stops);
+		}
+		else {
+			shift(@stops);
+		}
 	}
 
 	my $ref = {