diff --git a/features/guidance/motorway.feature b/features/guidance/motorway.feature
index 4d6bb8136..d10cd96af 100644
--- a/features/guidance/motorway.feature
+++ b/features/guidance/motorway.feature
@@ -278,6 +278,6 @@ Feature: Motorway Guidance
             | cd    |      | US 50; I 66 | motorway | yes    |
 
         When I route I should get
-            | waypoints | route | turns                          |
-            | a,d       | ,     | depart,turn slight left,arrive |
-            | b,d       | ,     | depart,arrive                  |
+            | waypoints | route | turns         |
+            | a,d       | ,     | depart,arrive |
+            | b,d       | ,     | depart,arrive |
diff --git a/src/extractor/guidance/motorway_handler.cpp b/src/extractor/guidance/motorway_handler.cpp
index 42d8f255f..18cafcd04 100644
--- a/src/extractor/guidance/motorway_handler.cpp
+++ b/src/extractor/guidance/motorway_handler.cpp
@@ -118,6 +118,9 @@ Intersection MotorwayHandler::fromMotorway(const EdgeID via_eid, Intersection in
     const auto getContinueAngle = [this, in_data](const Intersection &intersection) {
         for (const auto &road : intersection)
         {
+            if (!road.entry_allowed)
+                continue;
+
             const auto &out_data = node_based_graph.GetEdgeData(road.eid);
 
             const auto same_name = !util::guidance::requiresNameAnnounced(