diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
index e5f456d0c..8882f3c75 100644
--- a/src/main/java/de/neemann/digital/gui/Main.java
+++ b/src/main/java/de/neemann/digital/gui/Main.java
@@ -807,8 +807,10 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
 
             modelCreator = new ModelCreator(circuitComponent.getCircuit(), library);
 
-            if (model != null)
+            if (model != null) {
                 model.close();
+                circuitComponent.getCircuit().clearState();
+            }
 
             model = modelCreator.createModel(true);
             model.setWindowPosManager(windowPosManager);