diff --git a/src/main/java/guru/springframework/spring6restmvc/services/BeerServiceJPA.java b/src/main/java/guru/springframework/spring6restmvc/services/BeerServiceJPA.java
index 2558cb743..06f18fdd7 100644
--- a/src/main/java/guru/springframework/spring6restmvc/services/BeerServiceJPA.java
+++ b/src/main/java/guru/springframework/spring6restmvc/services/BeerServiceJPA.java
@@ -32,8 +32,8 @@ public List<BeerDTO> listBeers() {
 
     @Override
     public Optional<BeerDTO> getBeerById(UUID id) {
-        return Optional.ofNullable(beerMapper.beerToBeerDto(beerRepository.findById(id)
-                .orElse(null)));
+        return beerRepository.findById(id)
+                .map(beerMapper::beerToBeerDto);
     }
 
     @Override