diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index d8a7ff2d4..9d9bd6a72 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -547,7 +547,25 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		updateMotors();
 		updateActiveInstances();
 	}
-	
+
+	/**
+	 * Return true if a rocket has a configured Recovery Device
+	 */
+	public boolean hasRecoveryDevice() {
+		Rocket rkt = this.getRocket();
+		RocketComponent nextComponent = rkt.getNextComponent();
+
+		while(nextComponent != null) {
+			if(nextComponent instanceof RecoveryDevice) {
+				return true;
+			}
+			
+			nextComponent = nextComponent.getNextComponent();
+		}
+		
+		return false;
+	}
+
 	///////////////  Helper methods  ///////////////
 	
 	/**