diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
index 7e2dba71d..8f6c0ee10 100644
--- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
+++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
@@ -255,7 +255,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
 					final boolean wantToTumble = (cg > cp && aoa > AOA_TUMBLE_CONDITION);
 					final boolean isSustainer = currentStatus.getConfiguration().isStageActive(0);
 					final boolean isApogee = currentStatus.isApogeeReached();
-					if (wantToTumble) {
+					if (wantToTumble && (isApogee || !isSustainer)) {
 						addEvent(new FlightEvent(FlightEvent.Type.TUMBLE, currentStatus.getSimulationTime()));
 					}					
 				}