diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 0d9881980..166d90d8e 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -1107,6 +1107,9 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   public Object idEqualTo(String idName) {
+    if (idName == null) {
+      return null;
+    }
     if (list.size() == 1) {
       return list.get(0).getIdEqualTo(idName);
     }
diff --git a/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/src/test/java/org/tests/rawsql/TestOrderReportTotal.java
index 684970db3..afd270ad7 100644
--- a/src/test/java/org/tests/rawsql/TestOrderReportTotal.java
+++ b/src/test/java/org/tests/rawsql/TestOrderReportTotal.java
@@ -36,6 +36,11 @@ public class TestOrderReportTotal extends BaseTestCase {
     List<OrderAggregate> l2 = q2.findList();
     assertNotNull(l2);
 
+    Query<OrderAggregate> q3 = Ebean.createQuery(OrderAggregate.class).setRawSql(rawSql);
+    q3.where().eq("order_id", 1);
+
+    OrderAggregate orderAggregate = q3.findUnique();
+    assertNotNull(orderAggregate);
   }
 
   private RawSql getRawSql() {