diff --git a/sourcegen-generator/src/main/java/io/micronaut/sourcegen/generator/visitors/BuilderAnnotationVisitor.java b/sourcegen-generator/src/main/java/io/micronaut/sourcegen/generator/visitors/BuilderAnnotationVisitor.java
index b4fecdfc..c25649fd 100644
--- a/sourcegen-generator/src/main/java/io/micronaut/sourcegen/generator/visitors/BuilderAnnotationVisitor.java
+++ b/sourcegen-generator/src/main/java/io/micronaut/sourcegen/generator/visitors/BuilderAnnotationVisitor.java
@@ -108,7 +108,9 @@ public void visitClass(ClassElement element, VisitorContext context) {
             }
 
             builder.addMethod(MethodDef.constructor().build());
-            builder.addMethod(createAllPropertiesConstructor(builderType, properties));
+            if (!properties.isEmpty()) {
+                builder.addMethod(createAllPropertiesConstructor(builderType, properties));
+            }
 
             builder.addMethod(createBuilderMethod(builderType));
             builder.addMethod(createBuildMethod(element));
diff --git a/sourcegen-generator/src/main/java/io/micronaut/sourcegen/generator/visitors/SuperBuilderAnnotationVisitor.java b/sourcegen-generator/src/main/java/io/micronaut/sourcegen/generator/visitors/SuperBuilderAnnotationVisitor.java
index ae0adbfb..c9c42691 100644
--- a/sourcegen-generator/src/main/java/io/micronaut/sourcegen/generator/visitors/SuperBuilderAnnotationVisitor.java
+++ b/sourcegen-generator/src/main/java/io/micronaut/sourcegen/generator/visitors/SuperBuilderAnnotationVisitor.java
@@ -151,6 +151,7 @@ public void visitClass(ClassElement element, VisitorContext context) {
 
                 builder.addMethod(createSelfMethod());
                 builder.addMethod(BuilderAnnotationVisitor.createBuildMethod(element));
+                builder.addMethod(createBuilderMethod(builderType));
 
                 ClassDef builderDef = builder.build();
                 context.visitGeneratedSourceFile(builderDef.getPackageName(), builderDef.getSimpleName(), element).ifPresent(sourceFile -> {
@@ -178,6 +179,14 @@ public void visitClass(ClassElement element, VisitorContext context) {
         }
     }
 
+    private MethodDef createBuilderMethod(ClassTypeDef builderType) {
+        return MethodDef.builder("builder")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .returns(builderType)
+            .addStatement(builderType.instantiate().returning())
+            .build();
+    }
+
     private MethodDef createSelfMethod() {
         return MethodDef.builder("self")
             .addModifiers(Modifier.PUBLIC)
diff --git a/sourcegen-generator/src/test/groovy/io/micronaut/sourcegen/generator/visitors/BuilderAnnotationVisitorSpec.groovy b/sourcegen-generator/src/test/groovy/io/micronaut/sourcegen/generator/visitors/BuilderAnnotationVisitorSpec.groovy
index e5339808..c685ecad 100644
--- a/sourcegen-generator/src/test/groovy/io/micronaut/sourcegen/generator/visitors/BuilderAnnotationVisitorSpec.groovy
+++ b/sourcegen-generator/src/test/groovy/io/micronaut/sourcegen/generator/visitors/BuilderAnnotationVisitorSpec.groovy
@@ -29,4 +29,22 @@ class BuilderAnnotationVisitorSpec extends AbstractTypeElementSpec {
         walrus.age == 1
     }
 
+    void "test empty builder"() {
+        given:
+        var classLoader = buildClassLoader("test.Walrus", """
+        package test;
+        import io.micronaut.sourcegen.annotations.Builder;
+
+        @Builder
+        public record Walrus() {
+        }
+        """)
+        var walrusBuilderClass = classLoader.loadClass("test.WalrusBuilder")
+
+        expect:
+        var walrusBuilder = walrusBuilderClass.newInstance(new Object[]{})
+        var walrus = walrusBuilder.build()
+        walrus != null
+    }
+
 }
diff --git a/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyChild.java b/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyChild.java
new file mode 100644
index 00000000..ef6e04b8
--- /dev/null
+++ b/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyChild.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2017-2024 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.sourcegen.example;
+
+
+import io.micronaut.sourcegen.annotations.SuperBuilder;
+
+@SuperBuilder
+public class EmptyChild extends EmptyParent {
+}
diff --git a/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyParent.java b/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyParent.java
new file mode 100644
index 00000000..7474ec31
--- /dev/null
+++ b/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyParent.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017-2024 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.sourcegen.example;
+
+import io.micronaut.sourcegen.annotations.SuperBuilder;
+
+@SuperBuilder
+public class EmptyParent {
+}
diff --git a/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyThing.java b/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyThing.java
new file mode 100644
index 00000000..ba88c1aa
--- /dev/null
+++ b/test-suite-java/src/main/java/io/micronaut/sourcegen/example/EmptyThing.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017-2024 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.sourcegen.example;
+
+import io.micronaut.sourcegen.annotations.Builder;
+
+@Builder
+public class EmptyThing {
+}
diff --git a/test-suite-java/src/test/java/io/micronaut/sourcegen/example/EmptyTest.java b/test-suite-java/src/test/java/io/micronaut/sourcegen/example/EmptyTest.java
new file mode 100644
index 00000000..b7a3a53b
--- /dev/null
+++ b/test-suite-java/src/test/java/io/micronaut/sourcegen/example/EmptyTest.java
@@ -0,0 +1,19 @@
+package io.micronaut.sourcegen.example;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class EmptyTest {
+
+    @Test
+    void testEmptyBuilder() {
+        EmptyThing built = EmptyThingBuilder.builder().build();
+        Assertions.assertNotNull(built);
+    }
+
+    @Test
+    void testEmptySuperBuilder() {
+        EmptyChild built = EmptyChildSuperBuilder.builder().build();
+        Assertions.assertNotNull(built);
+    }
+}