diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
index 6a7aab4fa1..84837bbaaf 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
@@ -150,6 +150,14 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
                 return identifier + "_";
         }
 
+        // [#5557] Once more, this causes issues...
+        else if (definition instanceof SchemaDefinition) {
+            CatalogDefinition catalog = definition.getCatalog();
+
+            if (identifier.equals(getJavaIdentifier(catalog)))
+                return identifier + "_";
+        }
+
         return identifier;
     }