diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
index a0c8cad04..7dd192ecf 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
@@ -595,6 +595,10 @@ public class Rocket extends RocketComponent {
 			return;
 		}
 		
+		if( selectedConfiguration.getId().equals( fcid)){
+			selectedConfiguration = configSet.getDefault();
+		}
+		
 		// Get current configuration:
 		this.configSet.reset( fcid);
 		fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);