diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
index fca5406..89f9e6f 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
@@ -10038,11 +10038,19 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 				+ mimeType + " ,folder: " + saveResourceSession.getItemId()
 				+ "]");
 
-		FilesStorage storage = new FilesStorage();
-		storage.createItemOnWorkspaceByStorageId(storageId,
-				serviceCredentials.getUserName(), fileName,
-				saveResourceSession.getFileDescription(), mimeType,
-				saveResourceSession.getItemId());
+		if (storageId.startsWith("http:") || storageId.startsWith("https:")) {
+			FilesStorage storage = new FilesStorage();
+			storage.createItemOnWorkspace(storageId,
+					serviceCredentials.getUserName(), fileName,
+					saveResourceSession.getFileDescription(), mimeType,
+					saveResourceSession.getItemId());
+		} else {
+			FilesStorage storage = new FilesStorage();
+			storage.createItemOnWorkspaceByStorageId(storageId,
+					serviceCredentials.getUserName(), fileName,
+					saveResourceSession.getFileDescription(), mimeType,
+					saveResourceSession.getItemId());
+		}
 	}
 
 	protected void saveResourceByInputStream(