diff --git a/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java b/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
index 07311e32bf..120a3a040d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
@@ -219,7 +219,7 @@ public class OneToOneType extends EntityType {
 		Serializable id = ( Serializable ) getIdentifierType( session ).assemble( oid, session, null );
 
 		if ( id == null ) {
-			return null;
+			return resolve( session.getContextEntityIdentifier(owner), session, owner );
 		}
 
 		return resolveIdentifier( id, session );