diff --git a/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index 218486307cec18027ac03c66b622ae5e0d61e745..c1e5bd6332da2f7afc5f51bc2f112052d38d66d8 100644
--- a/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -220,7 +220,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				_shiftTime = absTime;
 			}
 			IResponse retVal;
-			if (ClutchClosed(absTime)) {
+			if (ClutchClosed(absTime) && !angularVelocity.IsEqual(0)) {
 				retVal = RequestGearEngaged(absTime, dt, torque, angularVelocity, dryRun);
 			} else {
 				retVal = RequestGearDisengaged(absTime, dt, torque, angularVelocity, dryRun);