diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
index f80984e..403925a 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
@@ -540,6 +540,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 							// IF NOT CANCELLED
 							String clickedButton = be.getButtonClicked().getItemId();
 							if (clickedButton.equals(Dialog.YES)) {
+								GWT.log("Calling unSharedFolderByFolderSharedId for id: "+folderIdentification);
 								explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.UNSHARING,
 										ConstantsExplorer.LOADINGSTYLE);
 								WorkspaceSharingServiceAsync.INSTANCE.unSharedFolderByFolderSharedId(
@@ -1942,11 +1943,15 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 								}
 
 								new MessageBoxAlert("Error", caught.getMessage() + ".", null);
+								
 								// System.out.println(caught.getMessage());
-								explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(
-										event.getTargetParentFileModel().getIdentifier(), false);
-								explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(
-										event.getFileSourceModel().getParentFileModel().getIdentifier(), true);
+//								explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(
+//										event.getTargetParentFileModel().getIdentifier(), false);
+//								explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(
+//										event.getFileSourceModel().getParentFileModel().getIdentifier(), true);
+								
+								//FXING THE ISSUE #16665
+								explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot();
 							}
 
 							@Override
@@ -1954,8 +1959,11 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 								explorerPanel.getAsycTreePanel().unmask();
 								if (result != null) {
 
-									if (result.getError() != null)
+									if (result.getError() != null) {
 										new MessageBoxAlert("Error", result.getError(), null);
+										//FXING THE ISSUE #16665
+										explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot();
+									}
 
 									explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder(
 											event.getTargetParentFileModel().getIdentifier(), true);