diff --git a/ebean-api/src/main/java/io/ebean/common/BeanSet.java b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
index 2f860bb0d..dda2b24ee 100644
--- a/ebean-api/src/main/java/io/ebean/common/BeanSet.java
+++ b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
@@ -119,7 +119,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     try {
       if (set == null) {
         if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(true);
+          lazyLoadCollection(false);
         } else {
           set = new LinkedHashSet<>();
         }
diff --git a/ebean-test/src/test/java/org/tests/sets/TestO2MSet.java b/ebean-test/src/test/java/org/tests/sets/TestO2MSet.java
index 59d0ccfa8..06a76b251 100644
--- a/ebean-test/src/test/java/org/tests/sets/TestO2MSet.java
+++ b/ebean-test/src/test/java/org/tests/sets/TestO2MSet.java
@@ -51,10 +51,8 @@ class TestO2MSet {
     employees.clear();
 
     sql = LoggedSql.collect();
-    assertThat(sql).hasSize(3);
-    assertThat(sql.get(0)).contains("select t0.department_id, t0.id from o2_memp t0 where (t0.department_id)");
-    assertThat(sql.get(1)).contains("select t0.id, t0.code, t0.name, t0.department_id from o2_memp t0 where t0.id = ?");
-    assertThat(sql.get(2)).contains("select t0.id, t0.code, t0.name, t0.department_id from o2_memp t0 where t0.id = ?");
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.department_id, t0.id, t0.code, t0.name, t0.department_id from o2_memp t0 where (t0.department_id)");
 
     final O2MEmp employee2 = new O2MEmp("After1", "Code3");
     employees.add(employee2);