diff --git a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
index 74329ea8bba..c26f65f87a0 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
@@ -311,7 +311,7 @@ public class ResponseEntity<T extends @Nullable Object> extends HttpEntity<T> {
 	 * @return the created {@code ResponseEntity}
 	 * @since 6.0.5
 	 */
-	public static <T extends @Nullable Object> ResponseEntity<T> ofNullable(@Nullable T body) {
+	public static <T extends @Nullable Object> ResponseEntity<T> ofNullable(T body) {
 		if (body == null) {
 			return notFound().build();
 		}
diff --git a/spring-web/src/test/kotlin/org/springframework/http/ResponseEntityKotlinTests.kt b/spring-web/src/test/kotlin/org/springframework/http/ResponseEntityKotlinTests.kt
index c330cf52adb..163374984ff 100644
--- a/spring-web/src/test/kotlin/org/springframework/http/ResponseEntityKotlinTests.kt
+++ b/spring-web/src/test/kotlin/org/springframework/http/ResponseEntityKotlinTests.kt
@@ -35,15 +35,6 @@ class ResponseEntityKotlinTests {
 		assertThat(responseEntity.body).isEqualTo(entity)
 	}
 
-	@Test
-	fun ofNullNullable() {
-		val responseEntity = ResponseEntity.ofNullable<Int>(null)
-		assertThat(responseEntity).isNotNull()
-		assertThat(responseEntity.statusCode).isEqualTo(HttpStatus.NOT_FOUND)
-		assertThat(responseEntity.body).isNull()
-	}
-
-
 	@Test
 	fun ofNullNullableType() {
 		val responseEntity = ResponseEntity.ofNullable<Int?>(null)
@@ -65,7 +56,7 @@ class ResponseEntityKotlinTests {
 		val responseEntity: ResponseEntity<Unit> = ResponseEntity.ok().build()
 		assertThat(responseEntity).isNotNull()
 		assertThat(responseEntity.statusCode).isEqualTo(HttpStatus.OK)
-		assertThat(responseEntity.body).isNull()
+		assertThat(responseEntity.body).isEqualTo(Unit)
 	}
 
 	@Test
@@ -81,7 +72,7 @@ class ResponseEntityKotlinTests {
 		val responseEntity = ResponseEntity.noContent().build<Unit>()
 		assertThat(responseEntity).isNotNull()
 		assertThat(responseEntity.statusCode).isEqualTo(HttpStatus.NO_CONTENT)
-		assertThat(responseEntity.body).isNull()
+		assertThat(responseEntity.body).isEqualTo(Unit)
 	}
 
 	@Test