diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index 62b5c1189041385eb50434da82e9434a0ea9a56c..270ec4ecc23efc670555bd233dd29a3429f09246 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -750,6 +750,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			response.Switch().
 				Case<ResponseGearShift>(r => {
 					response = Driver.DrivingActionRoll(absTime, ds, targetVelocity, gradient);
+						if (response is ResponseSpeedLimitExceeded) {
+							response = Driver.DrivingActionBrake(absTime, ds, DataBus.VehicleSpeed,
+																gradient);
+						}
 				}).
 				Case<ResponseSpeedLimitExceeded>(() => {
 					response = Driver.DrivingActionBrake(absTime, ds, DataBus.VehicleSpeed,