diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index 0a035b0636440b56db027ef7c96a565d84353f9a..08e7fa4a5d8775ab75d719f8738d989c2b04f431 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -1105,23 +1105,20 @@ sub station {
 			}
 			elsif ( $use_hafas and $status and $status->errcode eq 'LOCATION' )
 			{
-				$status->similar_stops_p->then(
+				$self->hafas->search_location_p( query => $station )->then(
 					sub {
-						my @suggestions = @_;
+						my ($hafas2) = @_;
+						my @suggestions = $hafas2->results;
 						if ( @suggestions == 1 ) {
 							$self->redirect_to(
-								'/s/' . $suggestions[0]->{id} . '?hafas=1' );
+								'/s/' . $suggestions[0]->eva . '?hafas=1' );
 						}
 						else {
 							$self->render(
 								'disambiguation',
 								suggestions => [
-									map {
-										{
-											name => $_->{name},
-											eva  => $_->{id}
-										}
-									} @suggestions
+									map { { name => $_->name, eva => $_->eva } }
+									  @suggestions
 								],
 								status => 300,
 							);
@@ -1133,7 +1130,7 @@ sub station {
 						$self->render(
 							'exception',
 							exception =>
-							  "StopFinder threw '$err2' when handling '$err'",
+"locationSearch threw '$err2' when handling '$err'",
 							status => 502
 						);
 					}
diff --git a/lib/Travelynx/Helper/HAFAS.pm b/lib/Travelynx/Helper/HAFAS.pm
index 1c369257a8ca16cdac93c9bf7b2d50f3cfc0f8fb..6a759b0343ec006caf87ef7901f1c9e072a7afe4 100644
--- a/lib/Travelynx/Helper/HAFAS.pm
+++ b/lib/Travelynx/Helper/HAFAS.pm
@@ -98,6 +98,17 @@ sub get_departures_p {
 	);
 }
 
+sub search_location_p {
+	my ( $self, %opt ) = @_;
+
+	return Travel::Status::DE::HAFAS->new_p(
+		locationSearch => $opt{query},
+		cache          => $self->{realtime_cache},
+		promise        => 'Mojo::Promise',
+		user_agent     => $self->{user_agent}->request_timeout(5),
+	);
+}
+
 sub get_journey_p {
 	my ( $self, %opt ) = @_;