diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
index efb7e558e56c6330df4824c80b0313024cfcb0f4..3e9dcfb4877b1a36d9f756b04f893c4a423dd54b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
@@ -363,7 +363,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					operatingPoint.InAngularVelocity);
 			}
 
-			var maxInputSpeed = VectoMath.Min(ModelData.TorqueConverterSpeedLimit, DataBus.EngineN95hSpeed);
+			var maxInputSpeed = VectoMath.Min(VectoMath.Min(ModelData.TorqueConverterSpeedLimit, DataBus.EngineN95hSpeed), DataBus.GetGearData(DataBus.Gear).MaxSpeed);
 			if (operatingPoint.InAngularVelocity.IsGreater(maxInputSpeed)) {
 				operatingPoint = ModelData.FindOperatingPoint(maxInputSpeed, outAngularVelocity);
 			}