diff --git a/source/reference/parameters.txt b/source/reference/parameters.txt
index db4df989ff4..d7ccd9f4b57 100644
--- a/source/reference/parameters.txt
+++ b/source/reference/parameters.txt
@@ -1095,6 +1095,38 @@ Replication Parameters
    for its :dbcommand:`find` command to finish during
    :ref:`data synchronization <replica-set-sync>`.
 
+.. parameter:: waitForSecondaryBeforeNoopWriteMS
+
+   .. versionadded:: 3.6
+
+   |mongod-only|
+
+   *Type*: integer
+
+   *Default*: 10
+
+   The length of time (in milliseconds) that a secondary must wait if
+   the ``afterClusterTime`` is greater than the last applied time from
+   the oplog. After the ``waitForSecondaryBeforeNoopWriteMS`` passes,
+   if the ``afterClusterTime`` is still greater than the last applied
+   time, the secondary makes a no-op write to advance the last applied
+   time.
+
+   The following example sets the
+   :parameter:`waitForSecondaryBeforeNoopWriteMS` to 20 seconds:
+
+   .. code-block:: sh
+
+      mongod --setParameter waitForSecondaryBeforeNoopWriteMS=20
+
+   During runtime, you can also set the parameter with the
+   :dbcommand:`setParameter` command:
+
+   .. code-block:: javascript
+
+      db.adminCommand( { setParameter: 1, waitForSecondaryBeforeNoopWriteMS: 20 } )
+
+
 Sharding Parameters
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/source/release-notes/3.6.txt b/source/release-notes/3.6.txt
index 0cde9673a59..b8e35354681 100644
--- a/source/release-notes/3.6.txt
+++ b/source/release-notes/3.6.txt
@@ -432,6 +432,10 @@ Replica Sets
   :dbcommand:`find` command to finish during :ref:`data synchronization
   <replica-set-sync>`.
 
+- Added the :parameter:`waitForSecondaryBeforeNoopWriteMS` parameter to
+  specify how long a secondary must wait if the ``afterClusterTime`` is
+  greater than the last applied time from the oplog.
+
 Sharded Clusters
 ----------------