diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
index 43f17056a7..25680e518b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
@@ -407,9 +407,11 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
                         String name = parameter.call("getName").<String>get();
 
                         // [#8004] Clean up kotlin field name for boolean types
-                        if ("boolean".equalsIgnoreCase(parameterTypes[i].getTypeName()) && name.startsWith("is")) {
+                        String typeName = parameterTypes[i].getTypeName();
+                        if (name.startsWith("is") &&
+                                (boolean.class.getName().equalsIgnoreCase(typeName) || Boolean.class.getName().equals(parameterTypes[i].getTypeName())))
                             name = getPropertyName(name);
-                        }
+
                         parameterNames.add(name);
                     }