diff --git a/core.windows/src/org/netbeans/core/windows/persistence/PersistenceManager.java b/core.windows/src/org/netbeans/core/windows/persistence/PersistenceManager.java
--- a/core.windows/src/org/netbeans/core/windows/persistence/PersistenceManager.java
+++ b/core.windows/src/org/netbeans/core/windows/persistence/PersistenceManager.java
@@ -774,6 +774,27 @@
                     continue;
                 }
                 try {
+
+                    // #158691 save olny persistent TC - remove all other instances
+                    if ( !isTopComponentPersistent(curTC)) {
+                        System.err.println("not persistent : "
+                                 + curTC);
+
+                        // check if corresponded object exists and remove it
+                        FileObject fo = compsFolder.getPrimaryFile ().getFileObject
+                                (curEntry.getKey (), "settings");  // NOI18N
+                        System.err.println("not persistent : "
+                                 + fo);
+                        if (fo != null) {
+                                fo.delete();
+                        }
+                        String id = topComponent2IDMap.get(curTC);
+                        if (id != null) {
+                            removeTCFromConfig(wmc,id);
+                        }
+                        continue;
+                    }
+
                     // bugfix #21223 top components are stored by IDO.SaveCookie
                     FileObject fo = compsFolder.getPrimaryFile ().getFileObject
                             (curEntry.getKey (), "settings");  // NOI18N