diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 491f5aef59..122378cd46 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -12299,6 +12299,8 @@ public class DSL {
      * can be used to avoid creating a <code>FROM</code> clause or a join
      * operation.
      */
+    @NotNull
+    @Support
     public static Table<?> noTable() {
         return NoTable.INSTANCE;
     }