diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
index dac2866a1..1584813f5 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
@@ -619,7 +619,7 @@ public class Rocket extends RocketComponent {
 	 */
 	public void setFlightConfigurationName(String id, String name) {
 		checkState();
-		if (name == null || name.equals("")) {
+		if (name == null || name.equals("") || DEFAULT_NAME.equals(name)) {
 			flightConfigurationNames.remove(id);
 		} else {
 			flightConfigurationNames.put(id, name);