diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 18b087305..c08bd83b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -120,7 +120,7 @@ final class AnnotationAssocOnes extends AnnotationAssoc {
       }
     }
 
-    prop.setJoinType(prop.isNullable());
+    prop.setJoinType(prop.isNullable() || prop.getForeignKey() != null && prop.getForeignKey().isNoConstraint());
 
     if (!prop.getTableJoin().hasJoinColumns() && beanTable != null) {
 
diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
index 8f36be0cb..280b4221c 100644
--- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
+++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java
@@ -1,6 +1,7 @@
 package org.tests.lazyforeignkeys;
 
 import io.ebean.annotation.DbForeignKey;
+import io.ebean.annotation.NotNull;
 import org.tests.model.basic.Cat;
 
 import javax.persistence.*;
@@ -29,6 +30,12 @@ public class MainEntityRelation {
   @DbForeignKey(noConstraint = true)
   private Cat cat;
 
+  @ManyToOne
+  @NotNull
+  @JoinColumn(name = "cat2_id")
+  @DbForeignKey(noConstraint = true)
+  private Cat cat2;
+
   private String attr1;
 
   public MainEntity getEntity1() {
@@ -55,6 +62,14 @@ public class MainEntityRelation {
     this.cat = cat;
   }
 
+  public Cat getCat2() {
+    return cat2;
+  }
+
+  public void setCat2(Cat cat2) {
+    this.cat2 = cat2;
+  }
+
   public String getAttr1() {
     return attr1;
   }
diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
index f88f14829..771862a95 100644
--- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
+++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java
@@ -10,9 +10,11 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Cat;
 
+import javax.persistence.EntityNotFoundException;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestLazyForeignKeys extends BaseTestCase {
@@ -32,6 +34,10 @@ public class TestLazyForeignKeys extends BaseTestCase {
 
     rel1.setEntity1(e1);
     rel1.setEntity2(e2);
+
+    Cat cat = new Cat();
+    cat.setId(4711L);
+    rel1.setCat2(cat);
     DB.save(rel1);
   }
 
@@ -57,13 +63,25 @@ public class TestLazyForeignKeys extends BaseTestCase {
 
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(3);
-    assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2, t1.species, t0.cat_id from main_entity_relation t0 left join animal t1 on t1.id = t0.cat_id");
+    assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2, t1.species, t0.cat_id, t2.species, t0.cat2_id "
+        + "from main_entity_relation t0 left join animal t1 on t1.id = t0.cat_id left join animal t2 on t2.id = t0.cat2_id");
     if (isSqlServer() || isOracle()) {
       assertSql(sql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, CASE WHEN t0.id is null THEN 1 ELSE 0 END from main_entity t0");
     } else {
       assertSql(sql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
       assertSql(sql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0");
     }
+
+    assertThat(rel1.getCat2().getId()).isEqualTo(4711L);
+    assertThatThrownBy(() -> rel1.getCat2().getName()).isInstanceOf(EntityNotFoundException.class);
+
+    Cat cat = new Cat();
+    cat.setId(4711L);
+    cat.setName("miau");
+    DB.save(cat);
+
+    DB.refresh(rel1);
+    assertThat(rel1.getCat2().getName()).isEqualTo("miau");
   }
 
   @Test
diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
index df9d0f3b0..9e3f66457 100644
--- a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+++ b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
@@ -773,19 +773,24 @@ public class TestQuerySingleAttribute extends BaseTestCase {
     e3.setAttr1("a1");
     DB.save(e3);
 
+    Cat cat = new Cat();
+    cat.setId(4711L);
     MainEntityRelation rel = new MainEntityRelation();
     rel.setEntity1(e1);
     rel.setEntity2(e1);
+    rel.setCat2(cat);
     DB.save(rel);
 
     rel = new MainEntityRelation();
     rel.setEntity1(e2);
     rel.setEntity2(e2);
+    rel.setCat2(cat);
     DB.save(rel);
 
     rel = new MainEntityRelation();
     rel.setEntity1(e3);
     rel.setEntity2(e3);
+    rel.setCat2(cat);
     DB.save(rel);
   }