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 65c94c3b9b2..7829613ec01 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
@@ -223,6 +223,7 @@ public class ResponseEntity<T> extends HttpEntity<T> {
 	 * @since 5.1
 	 */
 	public static <T> ResponseEntity<T> of(Optional<T> body) {
+		Assert.notNull(body, "Body must not be null");
 		return body.map(ResponseEntity::ok).orElse(notFound().build());
 	}