diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index 800467d56..5cedbce81 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -1097,7 +1097,9 @@ public interface EbeanServer {
    */
   @Deprecated
   @Nullable
-  <T> T findUnique(Query<T> query, Transaction transaction);
+  default <T> T findUnique(Query<T> query, Transaction transaction) {
+    return findOne(query, transaction);
+  }
 
   /**
    * Execute as a delete query deleting the 'root level' beans that match the predicates
@@ -1190,7 +1192,9 @@ public interface EbeanServer {
    */
   @Deprecated
   @Nullable
-  SqlRow findUnique(SqlQuery query, Transaction transaction);
+  default SqlRow findUnique(SqlQuery query, Transaction transaction) {
+    return findOne(query, transaction);
+  }
 
   /**
    * Either Insert or Update the bean depending on its state.
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index 205741cbc..fd013b4a0 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -283,7 +283,9 @@ public interface ExpressionList<T> {
    */
   @Deprecated
   @Nullable
-  T findUnique();
+  default T findUnique() {
+    return findOne();
+  }
 
   /**
    * Execute find row count query in a background thread.
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index 039bc9e47..6a9c7ddaf 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -871,7 +871,9 @@ public interface Query<T> {
    */
   @Deprecated
   @Nullable
-  T findUnique();
+  default T findUnique() {
+    return findOne();
+  }
 
   /**
    * Return versions of a @History entity bean.
diff --git a/src/main/java/io/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java
index dc2e24efd..3c568bd0a 100644
--- a/src/main/java/io/ebean/SqlQuery.java
+++ b/src/main/java/io/ebean/SqlQuery.java
@@ -82,7 +82,9 @@ public interface SqlQuery extends Serializable {
    * Deprecated - please migrate to findOne().
    */
   @Deprecated
-  SqlRow findUnique();
+  default SqlRow findUnique() {
+    return findOne();
+  }
 
   /**
    * The same as bind for named parameters.
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index d51456427..5bb58bb69 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1197,11 +1197,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
-  @Override
-  public <T> T findUnique(Query<T> query, Transaction transaction) {
-    return findOne(query, transaction);
-  }
-
   @Override
   public <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction) {
     return Optional.ofNullable(findOne(query, transaction));
@@ -1528,11 +1523,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
-  @Override
-  public SqlRow findUnique(SqlQuery query, Transaction t) {
-    return findOne(query, t);
-  }
-
   @Override
   public SqlRow findOne(SqlQuery query, Transaction t) {
 
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 98b91cc46..72d789a95 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -407,11 +407,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.findOneOrEmpty();
   }
 
-  @Override
-  public T findUnique() {
-    return query.findOne();
-  }
-
   @Override
   public ExpressionList<T> filterMany(String prop) {
     return query.filterMany(prop);
diff --git a/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
index f06a56516..1eeeb56ea 100644
--- a/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
@@ -81,11 +81,6 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
     return rootQuery.findSet();
   }
 
-  @Override
-  public T findUnique() {
-    return rootQuery.findOne();
-  }
-
   @Override
   public ExpressionList<T> having() {
     throw new PersistenceException(notAllowedMessage);
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index bb1c48e90..37d1e2510 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -404,11 +404,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.findOneOrEmpty();
   }
 
-  @Override
-  public T findUnique() {
-    return exprList.findOne();
-  }
-
   @Override
   public Query<T> forUpdate() {
     return exprList.forUpdate();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 68d275c9e..f94e9261c 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1265,11 +1265,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.findOneOrEmpty(this, null);
   }
 
-  @Override
-  public T findUnique() {
-    return findOne();
-  }
-
   @Override
   public FutureIds<T> findFutureIds() {
     return server.findFutureIds(this, null);
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index e13ea2d36..d2c9dfa6b 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -72,11 +72,6 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
     return Optional.ofNullable(findOne());
   }
 
-  @Override
-  public SqlRow findUnique() {
-    return findOne();
-  }
-
   @Override
   public DefaultRelationalQuery setParameter(int position, Object value) {
     bindParams.setParameter(position, value);
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index d371edaba..d64579d27 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -551,11 +551,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
-  @Override
-  public <T> T findUnique(Query<T> query, Transaction transaction) {
-    return null;
-  }
-
   @Override
   public List<SqlRow> findList(SqlQuery query, Transaction transaction) {
     return null;
@@ -574,11 +569,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
-  @Override
-  public SqlRow findUnique(SqlQuery query, Transaction transaction) {
-    return null;
-  }
-
   @Override
   public void save(Object bean) throws OptimisticLockException {