diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
index 863893c9f0..d68dbc82f6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
@@ -43,6 +43,7 @@ package org.jooq.impl;
 import static java.util.Arrays.asList;
 // ...
 // ...
+import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
 // ...
@@ -484,7 +485,9 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractQuery {
                 returned = returned.into(table);
 
             // [#5366] HSQLDB currently doesn't support fetching updated records in UPDATE statements.
-            if (returned.size() > 0) {
+            // [#5408] Other dialects may fall through the switch above (PostgreSQL, Firebird, Oracle) and must
+            //         execute this logic
+            if (returned.size() > 0 || ctx.family() != HSQLDB) {
                 result = returned.size();
                 ctx.rows(result);
             }