diff --git a/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java b/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
index 74dca09ba4..c648b34783 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java
@@ -2385,9 +2385,9 @@ protected void processResults(ResultHandler handler, int flags, boolean adaptive
               tupleBytes += accountBytes(tuple);
             } else {
               if (!hadTooManyTuples) {
-                handler.handleError(new PSQLException(GT.tr("Ran out of allowed memory retrieving query results."), PSQLState.OUT_OF_MEMORY));
-              } else {
                 hadTooManyTuples = true;
+                tuples = new ArrayList<Tuple>();
+                handler.handleError(new PSQLException(GT.tr("Ran out of allowed memory retrieving query results."), PSQLState.OUT_OF_MEMORY));
               }
             }
           }