diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
index 545c3f2d48..b1fcaaff14 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
@@ -999,7 +999,7 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
                     returnedResult =
                     create.select(returning)
                           .from(table)
-                          .where(rowid().equal(rowid().getDataType().convert(create.lastID())))
+                          .where(rowid().eq(DSL.field("last_insert_rowid()", rowid().getDataType())))
                           .fetch();
 
                     returnedResult.attach(((DefaultExecuteContext) ctx).originalConfiguration());