diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index a9793a7ce..0d0fe1e5e 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -931,7 +931,7 @@ public interface Query<T> extends CancelableQuery {
   <A> Set<A> findSingleAttributeSet();
 
   /**
-   * Execute a query returning a single value of a single property/column.
+   * Execute a query returning a single value or null for a single property/column.
    * <p>
    * <pre>{@code
    *
@@ -943,6 +943,7 @@ public interface Query<T> extends CancelableQuery {
    *
    * }</pre>
    */
+  @Nullable
   <A> A findSingleAttribute();
 
   /**
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 7f8621fb0..a7b24a85b 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -1767,7 +1767,7 @@ public abstract class TQRootBean<T, R> {
   }
 
   /**
-   * Execute the query returning a single value for a single property.
+   * Execute the query returning a single value or null for a single property.
    * <p>
    * <h3>Example</h3>
    * <pre>{@code
@@ -1781,6 +1781,7 @@ public abstract class TQRootBean<T, R> {
    *
    * @return the list of values for the selected property
    */
+  @Nullable
   public <A> A findSingleAttribute() {
     return query.findSingleAttribute();
   }