diff --git a/src/main/java/io/ebean/text/json/EJson.java b/src/main/java/io/ebean/text/json/EJson.java
index 28bca0dc1..f1b59c561 100644
--- a/src/main/java/io/ebean/text/json/EJson.java
+++ b/src/main/java/io/ebean/text/json/EJson.java
@@ -158,7 +158,12 @@ public class EJson {
     if (list == null) {
       return null;
     }
-    return ((ModifyAwareList) list).asSet();
+
+    if (modifyAware) {
+      return ((ModifyAwareList) list).asSet();
+    } else {
+      return new LinkedHashSet<>(list);
+    }
   }
 
   /**