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 d4b66edac7..55dd1f553d 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
@@ -3695,9 +3695,9 @@ public class JavaGenerator extends AbstractGenerator {
             out.println("%sopen class %s : %s<%s>(%s.name(\"%s\"), null, %s, %s.comment(\"[[%s]]\"), %s)[[before=, ][%s]] {", visibility(), className, classExtends, recordType, DSL.class, escapeString(udt.getOutputName()), packageId, DSL.class, asList(escapeString(comment)), synthetic, interfaces);
 
             out.println();
-            out.println("public companion object {");
+            out.println("%scompanion object {", visibility());
             out.javadoc("The reference instance of <code>%s</code>", udt.getQualifiedOutputName());
-            out.println("public val %s: %s = %s()", getStrategy().getJavaIdentifier(udt), className, className);
+            out.println("%sval %s: %s = %s()", visibility(), getStrategy().getJavaIdentifier(udt), className, className);
             out.println("}");
         }
         else {
@@ -9496,7 +9496,7 @@ public class JavaGenerator extends AbstractGenerator {
 
             out.println("%scompanion object {", visibility());
             out.javadoc("The reference instance of <code>%s</code>", catalogName);
-            out.println("public val %s: %s = %s()", catalogId, className, className);
+            out.println("%sval %s: %s = %s()", visibility(), catalogId, className, className);
             out.println("}");
         }
         else {
@@ -9624,7 +9624,7 @@ public class JavaGenerator extends AbstractGenerator {
             out.println("%sopen class %s : %s(%s.name(\"%s\"), %s, %s.comment(\"[[%s]]\"))[[before=, ][%s]] {",
                 visibility(), className, classExtends, DSL.class, escapeString(schema.getOutputName()), catalogId, DSL.class, asList(escapeString(comment)), interfaces);
 
-            out.println("public companion object {");
+            out.println("%scompanion object {", visibility());
             out.javadoc("The reference instance of <code>%s</code>", schemaName);
             out.println("%sval %s: %s = %s()", visibility(), scalaWhitespaceSuffix(schemaId), className, className);
             out.println("}");