diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
index 4c4c423b02..41bbf6e65d 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
@@ -43,6 +43,11 @@ public class JavaWriter extends GeneratorWriter<JavaWriter> {
         this.isJava = file.getName().endsWith(".java");
         this.isScala = file.getName().endsWith(".scala");
         this.fullyQualifiedTypes = fullyQualifiedTypes == null ? null : Pattern.compile(fullyQualifiedTypes);
+
+        if (isJava)
+            tabString("    ");
+        else if (isScala)
+            tabString("  ");
     }
 
     public JavaWriter print(Class<?> clazz) {