diff --git a/src/microsim/traffic_lights/MSDriveWay.cpp b/src/microsim/traffic_lights/MSDriveWay.cpp
index a2538684025..2e5c6c18708 100644
--- a/src/microsim/traffic_lights/MSDriveWay.cpp
+++ b/src/microsim/traffic_lights/MSDriveWay.cpp
@@ -981,7 +981,7 @@ MSDriveWay::buildRoute(const MSLink* origin, double length,
                     }
 #endif
                 }
-                if (links.size() > 1) {
+                if (links.size() > 1 && !foundUnsafeSwitch) {
                     // switch on driveway
                     mySwitchDriveWays[link].push_back(this);
                     myForwardSwitches.push_back(link);