diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
index 2f0fd77fc8..219f2e9a4f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java
@@ -286,8 +286,11 @@ public class DefaultRecordMapper<R extends Record, E> implements RecordMapper<R,
             return;
         }
 
-        // [#3212] "Value types" can be mapped from single-field Record1 types for convenience
-        if (type.isPrimitive() || DefaultDataType.types().contains(type)) {
+        // [#3212] [#5154] "Value types" can be mapped from single-field Record1
+        //                 types for convenience
+        if (type.isPrimitive()
+                || DefaultDataType.types().contains(type)
+                || Enum.class.isAssignableFrom(type)) {
             delegate = new ValueTypeMapper();
             return;
         }