diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index 96240d25772d60c38cb0adf4cc1966a7af9dfeb8..0a58c1de712ed7d85f2351f199c9e23d42c8453b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -684,6 +684,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			if (best == null) {
 				best = ResponseEmOff;
 				best.ICEOff = false;
+				if (AllowEmergencyShift && GearList.HasSuccessor(currentGear)) {
+					var testResponse = GetEmOffResultEntry(absTime, dt, outTorque, outAngularVelocity, currentGear);
+					if (testResponse.Response.Engine.EngineSpeed.IsGreaterOrEqual(ModelData.EngineData.FullLoadCurves[0]
+						.RatedSpeed)) {
+						best.Gear = GearList.Successor(currentGear);
+					}
+				}
 			}
 
 			var retVal = CreateResponse(best, currentGear);