diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java
index 4a473b2..03c9e86 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java
@@ -1085,7 +1085,13 @@ public abstract class ElementManagement<El extends OElement, T extends Type> {
 					if(object != null) {
 						if(object instanceof ODocument) {
 							element.setProperty(key, object, OType.EMBEDDED);
-						}else {
+						/*
+						 * Due to bug https://github.com/orientechnologies/orientdb/issues/7354
+						 * we should not support ArrayList
+						 */
+						} else if(object instanceof List){
+							element.setProperty(key, object, OType.EMBEDDEDLIST);
+						} else {
 							element.setProperty(key, object);
 						}
 					}