diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/openlayerwidget/GeoJsonAreaSelectionDialog.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/openlayerwidget/GeoJsonAreaSelectionDialog.java
index d338490..ec82727 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/openlayerwidget/GeoJsonAreaSelectionDialog.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/openlayerwidget/GeoJsonAreaSelectionDialog.java
@@ -172,9 +172,17 @@ public class GeoJsonAreaSelectionDialog extends AreaSelectionDialog{
 	 */
 	public static ListBox getGeometries() {
 		ListBox geometries = new ListBox();
-		for (GeometryType geometry : GeometryType.values()) {
-			geometries.addItem(geometry.name(),geometry.name());
-		}
+		
+		//see Feature #13074
+//		for (GeometryType geometry : GeometryType.values()) {
+//			geometries.addItem(geometry.name(),geometry.name());
+//		}
+		
+		geometries.addItem(GeometryType.Point.name(), GeometryType.Point.name());
+		geometries.addItem(GeometryType.LineString.name(), GeometryType.LineString.name());
+		geometries.addItem(GeometryType.Triangle.name(), GeometryType.Triangle.name());
+		geometries.addItem(GeometryType.Square.name(), GeometryType.Square.name());
+		geometries.addItem(GeometryType.Pentagon.name(), GeometryType.Pentagon.name());
 		return geometries;
 	}