diff --git a/core/src/net/sf/openrocket/document/Simulation.java b/core/src/net/sf/openrocket/document/Simulation.java
index 39a97d930..594734e2b 100644
--- a/core/src/net/sf/openrocket/document/Simulation.java
+++ b/core/src/net/sf/openrocket/document/Simulation.java
@@ -13,6 +13,7 @@ import net.sf.openrocket.masscalc.MassCalculator;
 import net.sf.openrocket.rocketcomponent.Configuration;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.simulation.BasicEventSimulationEngine;
+import net.sf.openrocket.simulation.DefaultSimulationOptionFactory;
 import net.sf.openrocket.simulation.FlightData;
 import net.sf.openrocket.simulation.RK4SimulationStepper;
 import net.sf.openrocket.simulation.SimulationConditions;
@@ -105,8 +106,11 @@ public class Simulation implements ChangeSource, Cloneable {
 		this.status = Status.NOT_SIMULATED;
 		
 		options = new SimulationOptions(rocket);
-		options.setMotorConfigurationID(
-				rocket.getDefaultConfiguration().getFlightConfigurationID());
+		
+		DefaultSimulationOptionFactory f = Application.getInjector().getInstance(DefaultSimulationOptionFactory.class);
+		options.copyConditionsFrom(f.getDefault());
+		
+		options.setMotorConfigurationID(rocket.getDefaultConfiguration().getFlightConfigurationID());
 		options.addChangeListener(new ConditionListener());
 	}