diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/Binder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/Binder.java
index 3e66ac93e3..adfa0aa28c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/Binder.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/Binder.java
@@ -1219,9 +1219,8 @@ private void resolveSingularAttributeTypeInformation(SingularAttributeBinding at
 						EMPTY_PROPERTIES
 				);
 			}
-		}
-
-		if ( resolvedType != null ) {
+		} else {
+			attributeBinding.getHibernateTypeDescriptor().setResolvedTypeMapping( resolvedType );
 			pushHibernateTypeInformationDownIfNeeded( attributeBinding, resolvedType );
 		}
 	}
@@ -1232,7 +1231,9 @@ private Type determineHibernateTypeFromDescriptor(HibernateTypeDescriptor hibern
 		}
 		String typeName = determineTypeName( hibernateTypeDescriptor );
 		Properties typeParameters = getTypeParameters( hibernateTypeDescriptor );
-		return getHeuristicType( typeName, typeParameters );
+		Type type = getHeuristicType( typeName, typeParameters );
+		hibernateTypeDescriptor.setResolvedTypeMapping( type );
+		return type;
 	}
 
 	private static String determineTypeName(HibernateTypeDescriptor hibernateTypeDescriptor) {