diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
index f9051a188e..6b729b1fd7 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
@@ -9377,7 +9377,20 @@ public class JavaGenerator extends AbstractGenerator {
 
         @Override
         public String classLiteral(String type) {
-            String rawtype = type.replaceAll("<.*>", "").replaceAll("\\[.*\\]", "");
+            String rawtype;
+
+            switch (language) {
+                case SCALA:
+                    rawtype = type.replaceAll("\\[.*\\]", "");
+                    break;
+
+                case KOTLIN:
+                case JAVA:
+                default:
+                    rawtype = type.replaceAll("<.*>", "");
+                    break;
+            }
+
             boolean generic = !rawtype.equals(type);
 
             switch (language) {