diff --git a/jOOQ/src/main/java/org/jooq/SchemaMapping.java b/jOOQ/src/main/java/org/jooq/SchemaMapping.java
index 2dd0a9d226..6989559f0d 100644
--- a/jOOQ/src/main/java/org/jooq/SchemaMapping.java
+++ b/jOOQ/src/main/java/org/jooq/SchemaMapping.java
@@ -414,7 +414,9 @@ public class SchemaMapping implements Serializable {
 
         // The configured default schema is mapped to "null". This prevents
         // it from being rendered to SQL
-        if ("".equals(result.getName()) || result.getName().equals(mapping().getDefaultSchema()))
+        if ("".equals(result.getName())
+            || result.getName().equals(mapping().getDefaultSchema())
+                && (result.getCatalog() == null || result.getCatalog().getName().equals(mapping().getDefaultCatalog())))
             result = null;
 
         return result;
diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java
index 2c0ab90805..49580bc8e3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java
@@ -85,7 +85,8 @@ public class CatalogImpl extends AbstractNamed implements Catalog {
 
     @Override
     public final void accept(Context<?> ctx) {
-        ctx.visit(getUnqualifiedName());
+        Catalog mappedCatalog = Tools.getMappedCatalog(ctx.configuration(), this);
+        ctx.visit(mappedCatalog != null ? mappedCatalog.getUnqualifiedName() : getUnqualifiedName());
     }
 
     @Override