diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java
index 3803adfbe90ec7934e10e795cd5079561979ace8..e07796c336eb8c182d9f453c1506bacc6bf38639 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java
@@ -954,7 +954,7 @@ public class PgStatement implements Statement, BaseStatement {
       flags |= QueryExecutor.QUERY_EXECUTE_AS_SIMPLE;
     }
 
-    boolean sameQueryAhead = queries.length > 1 && queries[0] == queries[1];
+    boolean sameQueryAhead = (wantsGeneratedKeysAlways) || (queries.length > 1 && queries[0] == queries[1]);
 
     if (!sameQueryAhead
         // If executing the same query twice in a batch, make sure the statement