diff --git a/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc b/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc
index 07b72eac8..7406949ef 100644
--- a/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc
+++ b/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc
@@ -161,7 +161,7 @@ public class QueryCustomizer
 
     private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """
 		UPDATE %TABLE_NAME%_ATTRIBUTES
-		SET ATTRIBUTE_BYTES = encode(?, 'escape')::jsonb
+		SET ATTRIBUTE_BYTES = convert_from(?, 'UTF8')::jsonb
 		WHERE SESSION_PRIMARY_ID = ?
 		AND ATTRIBUTE_NAME = ?
 		""";
@@ -309,12 +309,12 @@ public class SessionConfig {
 
     private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
             INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
-            VALUES (?, ?, encode(?, 'escape')::jsonb) <1>
+            VALUES (?, ?, convert_from(?, 'UTF8')::jsonb) <1>
             """;
 
     private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """
             UPDATE %TABLE_NAME%_ATTRIBUTES
-            SET ATTRIBUTE_BYTES = encode(?, 'escape')::jsonb
+            SET ATTRIBUTE_BYTES = convert_from(?, 'UTF8')::jsonb
             WHERE SESSION_PRIMARY_ID = ?
             AND ATTRIBUTE_NAME = ?
             """;
diff --git a/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config/SessionConfig.java b/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config/SessionConfig.java
index 817d17a05..5c9acc630 100644
--- a/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config/SessionConfig.java
+++ b/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config/SessionConfig.java
@@ -23,7 +23,7 @@ public class SessionConfig implements BeanClassLoaderAware {
 
 	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
 			INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
-			VALUES (?, ?, encode(?, 'escape')::jsonb)
+			VALUES (?, ?, convert_from(?, 'UTF8')::jsonb)
 			""";
 
 	private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """
diff --git a/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/resources/application.properties b/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/resources/application.properties
index e8e848d11..8b21caa8f 100644
--- a/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/resources/application.properties
+++ b/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+spring.security.user.name=rüdiger
 spring.security.user.password=password
 spring.session.jdbc.schema=classpath:schema.sql
 spring.session.jdbc.initialize-schema=always
diff --git a/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/test/java/sample/JdbcJsonAttributeTests.java b/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/test/java/sample/JdbcJsonAttributeTests.java
index 0a1ee9cb3..0ebe919eb 100644
--- a/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/test/java/sample/JdbcJsonAttributeTests.java
+++ b/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/test/java/sample/JdbcJsonAttributeTests.java
@@ -51,7 +51,7 @@ void setup() {
 
 	@Test
 	void loginShouldSaveSecurityContextAsJson() throws Exception {
-		Cookie sessionCookie = this.mvc.perform(formLogin().user("user").password("password"))
+		Cookie sessionCookie = this.mvc.perform(formLogin().user("rĂ¼diger").password("password"))
 			.andExpect(authenticated())
 			.andReturn()
 			.getResponse()
@@ -66,20 +66,20 @@ void loginShouldSaveSecurityContextAsJson() throws Exception {
 		SecurityContext securityContext = this.objectMapperWithModules.readValue((String) attributeBytes,
 				SecurityContext.class);
 		assertThat(securityContext).isNotNull();
-		assertThat(securityContext.getAuthentication().getName()).isEqualTo("user");
+		assertThat(securityContext.getAuthentication().getName()).isEqualTo("rĂ¼diger");
 	}
 
 	@Test
 	void loginWhenQueryUsingJsonbOperatorThenReturns() throws Exception {
-		this.mvc.perform(formLogin().user("user").password("password")).andExpect(authenticated());
-		Object attributeBytes = this.jdbcClient.sql("""
+  this.mvc.perform(formLogin().user("rĂ¼diger").password("password")).andExpect(authenticated());
+  Object attributeBytes = this.jdbcClient.sql("""
 				SELECT attribute_bytes::text FROM spring_session_attributes
-				WHERE attribute_bytes -> 'authentication' -> 'principal' ->> 'username' = 'user'
+				WHERE attribute_bytes -> 'authentication' -> 'principal' ->> 'username' = 'rĂ¼diger'
 				""").query().singleValue();
 		SecurityContext securityContext = this.objectMapperWithModules.readValue((String) attributeBytes,
 				SecurityContext.class);
 		assertThat(securityContext).isNotNull();
-		assertThat(securityContext.getAuthentication().getName()).isEqualTo("user");
+		assertThat(securityContext.getAuthentication().getName()).isEqualTo("rĂ¼diger");
 	}
 
 }