diff --git a/fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/SelectQueryInternal.java b/fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/SelectQueryInternal.java
index a4368c1..e65d3e1 100644
--- a/fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/SelectQueryInternal.java
+++ b/fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/SelectQueryInternal.java
@@ -91,7 +91,7 @@ public <T> Optional<T> firstResult(Mapper<T> mapper) {
                         while (rs.next() && !result.isPresent()) {
                             T candidate = mapper.map(rs);
                             if (filter.test(candidate)) {
-                                result = Optional.of(candidate);
+                                result = Optional.ofNullable(candidate);
                             }
                         }
                         return result;