diff --git a/core/src/main/java/info/openrocket/core/models/wind/MultiLevelWindModel.java b/core/src/main/java/info/openrocket/core/models/wind/MultiLevelWindModel.java
index ecc2202c7..fe99f77dd 100644
--- a/core/src/main/java/info/openrocket/core/models/wind/MultiLevelWindModel.java
+++ b/core/src/main/java/info/openrocket/core/models/wind/MultiLevelWindModel.java
@@ -146,7 +146,7 @@ public class MultiLevelWindModel implements WindModel {
 
 		public WindLevel(double altitude, double speed, double direction) {
 			this.altitude = altitude;
-			this.speed = speed;
+			this.speed = Math.max(speed, 0.1);
 			this.direction = direction;
 		}
 
diff --git a/core/src/main/java/info/openrocket/core/models/wind/PinkNoiseWindModel.java b/core/src/main/java/info/openrocket/core/models/wind/PinkNoiseWindModel.java
index 3349320fa..7f0001fe7 100644
--- a/core/src/main/java/info/openrocket/core/models/wind/PinkNoiseWindModel.java
+++ b/core/src/main/java/info/openrocket/core/models/wind/PinkNoiseWindModel.java
@@ -78,11 +78,12 @@ public class PinkNoiseWindModel implements WindModel {
 	 * @param average the average wind speed to set
 	 */
 	public void setAverage(double average) {
+		average = Math.max(average, 0.1);
 		if (average == this.average) {
 			return;
 		}
 		double intensity = getTurbulenceIntensity();
-		this.average = Math.max(average, 0);
+		this.average = average;
 		setTurbulenceIntensity(intensity);
 		fireChangeEvent();
 	}