diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
index 3627bb13d610..594ce5ec6174 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
@@ -79,7 +79,7 @@ public MutabilityPlan<J> getMutabilityPlan() {
 
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
-		return context.getJdbcType( userType.getSqlType() );
+		return userType.getJdbcType( context.getTypeConfiguration() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
index 22b0a6819c5f..74c3c9e79797 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
@@ -501,7 +501,7 @@ default int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 
 	/**
 	 * A mapped {@link JdbcType}. By default, the {@code JdbcType}
-	 * registered under our {@link #getSqlType() type code}.
+	 * registered under our {@linkplain #getSqlType type code}.
 	 */
 	@Incubating
 	default JdbcType getJdbcType(TypeConfiguration typeConfiguration) {