diff --git a/jOOQ/src/main/java/org/jooq/Configuration.java b/jOOQ/src/main/java/org/jooq/Configuration.java
index b1321ee8a6..876765dfbe 100644
--- a/jOOQ/src/main/java/org/jooq/Configuration.java
+++ b/jOOQ/src/main/java/org/jooq/Configuration.java
@@ -123,8 +123,7 @@ public interface Configuration extends Serializable {
      * See {@link ExecuteListener} for more details.
      *
      * @param key A key to identify the custom data
-     * @param value The custom data or <code>null</code> to unset the custom
-     *            data
+     * @param value The custom data
      * @return The previously set custom data or <code>null</code> if no data
      *         was previously set for the given key
      * @see ExecuteListener
diff --git a/jOOQ/src/main/java/org/jooq/Context.java b/jOOQ/src/main/java/org/jooq/Context.java
index e7459196fc..33634e44e2 100644
--- a/jOOQ/src/main/java/org/jooq/Context.java
+++ b/jOOQ/src/main/java/org/jooq/Context.java
@@ -104,8 +104,7 @@ public interface Context<C extends Context<C>> {
      * matches that of a render or bind context.
      *
      * @param key A key to identify the custom data
-     * @param value The custom data or <code>null</code> to unset the custom
-     *            data
+     * @param value The custom data
      * @return The previously set custom data or <code>null</code> if no data
      *         was previously set for the given key
      * @see ExecuteListener
diff --git a/jOOQ/src/main/java/org/jooq/ExecuteContext.java b/jOOQ/src/main/java/org/jooq/ExecuteContext.java
index 8f1fb5ecea..52655e360d 100644
--- a/jOOQ/src/main/java/org/jooq/ExecuteContext.java
+++ b/jOOQ/src/main/java/org/jooq/ExecuteContext.java
@@ -102,8 +102,7 @@ public interface ExecuteContext {
      * matches that of a single query execution.
      *
      * @param key A key to identify the custom data
-     * @param value The custom data or <code>null</code> to unset the custom
-     *            data
+     * @param value The custom data
      * @return The previously set custom data or <code>null</code> if no data
      *         was previously set for the given key
      * @see ExecuteListener
diff --git a/jOOQ/src/main/java/org/jooq/RecordContext.java b/jOOQ/src/main/java/org/jooq/RecordContext.java
index 70fb7c3ac2..6df70ee65e 100644
--- a/jOOQ/src/main/java/org/jooq/RecordContext.java
+++ b/jOOQ/src/main/java/org/jooq/RecordContext.java
@@ -93,8 +93,7 @@ public interface RecordContext {
      * that of a single query execution.
      *
      * @param key A key to identify the custom data
-     * @param value The custom data or <code>null</code> to unset the custom
-     *            data
+     * @param value The custom data
      * @return The previously set custom data or <code>null</code> if no data
      *         was previously set for the given key
      * @see RecordListener
diff --git a/jOOQ/src/main/java/org/jooq/VisitContext.java b/jOOQ/src/main/java/org/jooq/VisitContext.java
index b70e4b5c1b..9428434c12 100644
--- a/jOOQ/src/main/java/org/jooq/VisitContext.java
+++ b/jOOQ/src/main/java/org/jooq/VisitContext.java
@@ -82,8 +82,7 @@ public interface VisitContext {
      * {@link #context()}.
      *
      * @param key A key to identify the custom data
-     * @param value The custom data or <code>null</code> to unset the custom
-     *            data
+     * @param value The custom data
      * @return The previously set custom data or <code>null</code> if no data
      *         was previously set for the given key
      * @see VisitContext