diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java
index b41467ca5..9a78a3e40 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -374,7 +374,8 @@ public class SqlTreeNodeBean implements SqlTreeNode {
         if (ref != null) {
           if (disableLazyLoad) {
             ref.setDisableLazyLoad(true);
-          } else if (!ref.isRegisteredWithLoadContext()) {
+          }
+          if (!ref.isRegisteredWithLoadContext()) {
             ctx.register(manys[i].getName(), ref);
           }
         }
diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
index 864e18cd0..da78d2485 100644
--- a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
+++ b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
@@ -94,6 +94,9 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
     // normally invokes lazy loading
     orderDetail.getShipQty();
 
+    // normally invokes lazy loading
+    order.getShipments().size();
+
     List<String> loggedSql = LoggedSqlCollector.stop();
     assertThat(loggedSql).hasSize(2);