diff --git a/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java b/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
index 5c571c3900..a1085adc20 100644
--- a/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
+++ b/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
@@ -41,6 +41,7 @@ import org.talend.core.ui.IReferencedProjectService;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.IProxyRepositoryService;
 import org.talend.repository.model.IRepositoryNode;
+import org.talend.repository.model.RepositoryNode;
 import org.talend.repository.model.nodes.IProjectRepositoryNode;
 
 /**
@@ -383,6 +384,11 @@ public final class ProjectManager {
 
                     // FIXME still have many NPE for repository, so comment it
                     // tmpProjectNode.dispose();
+                    if (tmpProjectNode instanceof RepositoryNode) {
+                        ((RepositoryNode) tmpProjectNode).setEnableDisposed(true);
+                    }
+
+                    tmpProjectNode.dispose();
                 }
             }
             viewProjectNodes.add(projectRepNode);
diff --git a/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java b/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java
index e26e673fe6..44c9652b2a 100644
--- a/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java
+++ b/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java
@@ -453,8 +453,8 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
         if (doDispose) {
             this.id = null;
             this.projectTechnicalLabel = null;
-            this.type = null;
-            this.icon = null;
+            // this.type = null;
+            // this.icon = null;
             this.parent = null;
             this.object = null;