diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
index e233c764f8c2661f267ed228d4847cf245f16fb8..74814351b87673d860cc478498e001602255744b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
@@ -321,13 +321,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			}
 
 			if (!CurrentState.TorqueConverterLocked) {
-				return TorqueConverter.Request(absTime, dt, inTorque, inAngularVelocity, dryRun);
+				var response = TorqueConverter.Request(absTime, dt, inTorque, inAngularVelocity, dryRun);
+				if (response is ResponseGearShift) {
+					RequestAfterGearshift = true;
+				}
+				return response;
 			}
 			var retVal = NextComponent.Request(absTime, dt, inTorque, inAngularVelocity, dryRun);
 			if (!dryRun && retVal is ResponseSuccess &&
 				_strategy.ShiftRequired(absTime, dt, outTorque, outAngularVelocity, inTorque, inAngularVelocity, Gear,
 					LastShift)) {
-				return new ResponseGearShift { Source = this };
+				retVal = new ResponseGearShift { Source = this };
+				RequestAfterGearshift = true;
 			}
 
 			return retVal;