diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
index 3f6b19d..421f7fb 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
@@ -46,7 +46,6 @@ import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.InternalErrorEx
 import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.ItemAlreadyExistException;
 import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.ItemNotFoundException;
 import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.WrongItemTypeException;
-import org.gcube.common.storagehubwrapper.shared.tohl.impl.WorkspaceSharedFolder;
 import org.gcube.portlets.widgets.workspaceuploader.client.ConstantsWorkspaceUploader;
 import org.gcube.portlets.widgets.workspaceuploader.server.notification.NotificationsWorkspaceUploader;
 import org.gcube.portlets.widgets.workspaceuploader.server.notification.NotificationsWorkspaceUploaderProducer;
@@ -490,7 +489,14 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 					WsUtil.putWorkspaceUploaderInSession(request.getSession(), workspaceUploader);
 				} catch (Exception e1) {
 					logger.error("Error during WorkspaceUploaderItem session update: ",e1);
+				}finally {
+					try {
+						WsUtil.setErasableWorkspaceUploaderInSession(request, workspaceUploader.getIdentifier());
+					} catch (Exception e2) {
+						logger.error("Error during setErasableWorkspaceUploaderInSession session update: ",e2);
+					}
 				}
+				return;
 			}
 			
 			//Removing path from fileName