diff --git a/src/main/java/org/gcube/datatransfer/resolver/geoportal/ResourceGeoportalCodes.java b/src/main/java/org/gcube/datatransfer/resolver/geoportal/ResourceGeoportalCodes.java
index 91fa566..83350e0 100644
--- a/src/main/java/org/gcube/datatransfer/resolver/geoportal/ResourceGeoportalCodes.java
+++ b/src/main/java/org/gcube/datatransfer/resolver/geoportal/ResourceGeoportalCodes.java
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
  */
 public enum ResourceGeoportalCodes {
 
-	GEO("geo", "data-viewer", "Geoportal Viewer"), GEOV("geo-v", "data-viewer", "Geoportal Viewer");
+	GEO("geo", "geoportal-viewer", "Geoportal Viewer"), GEO_V("geo-v", "data-viewer", "Geoportal Viewer");
 
 	private String id; // the code id
 	private String target_app; // the code value
diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java
index af051c7..49acb0a 100644
--- a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java
+++ b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java
@@ -257,7 +257,9 @@ public class GeoportalResolver {
 
 			if (resoruceGeoportalCodes == null) {
 				LOG.error("Target application is null/malformed");
-
+				resoruceGeoportalCodes = ResourceGeoportalCodes.GEO;
+				LOG.info("Target application using default: "+resoruceGeoportalCodes);
+			}else {
 				List<String> targetApps = Arrays.asList(ResourceGeoportalCodes.values()).stream()
 						.map(ResourceGeoportalCodes::getTarget_app).collect(Collectors.toList());