diff --git a/website/pages/docs/configuration/index.mdx b/website/pages/docs/configuration/index.mdx
index bd04b37e9a3d..fa418d5a736f 100644
--- a/website/pages/docs/configuration/index.mdx
+++ b/website/pages/docs/configuration/index.mdx
@@ -81,6 +81,17 @@ to specify where the configuration is.
   process's entire memory address space from spilling to disk and is therefore
   automatically disabled on unsupported platforms.
 
+  Disabling `mlock` is strongly recommended if using [integrated
+  storage](/docs/internals/integrated-storage) due to
+  the fact that `mlock` does not interact well with memory mapped files such as
+  those created by BoltDB, which is used by Raft to track state. When using
+  `mlock`, memory-mapped files get loaded into resident memory which causes
+  Vault's entire dataset to be loaded in-memory and cause out-of-memory
+  issues if Vault's data becomes larger than the available RAM. In this case,
+  even though the data within BoltDB remains encrypted at rest, swap should be
+  disabled to prevent Vault's other in-memory sensitive data from being dumped
+  into disk.
+
   On Linux, to give the Vault executable the ability to use the `mlock`
   syscall without running the process as root, run:
 
@@ -88,7 +99,9 @@ to specify where the configuration is.
   sudo setcap cap_ipc_lock=+ep $(readlink -f $(which vault))
   ```
 
-  Note: Since each plugin runs as a separate process, you need to do the same for each plugin in your [plugins directory](/docs/internals/plugins#plugin-directory).
+  Note: Since each plugin runs as a separate process, you need to do the same
+  for each plugin in your [plugins
+  directory](/docs/internals/plugins#plugin-directory).
 
   If you use a Linux distribution with a modern version of systemd, you can add
   the following directive to the "[Service]" configuration section:
diff --git a/website/pages/docs/configuration/storage/raft.mdx b/website/pages/docs/configuration/storage/raft.mdx
index 50978086738b..f383c69c5bc5 100644
--- a/website/pages/docs/configuration/storage/raft.mdx
+++ b/website/pages/docs/configuration/storage/raft.mdx
@@ -39,6 +39,9 @@ between the nodes in the Raft cluster.
 ~> **Note:** Raft cannot be used as the configured `ha_storage` backend at this
 time. To use Raft for HA coordination users must also use Raft for storage.
 
+~> **Note:** When using the Raft storage backend, it is strongly recommended to
+set `disable_mlock` to `true`, and to disable memory swapping on the system.
+
 ## `raft` Parameters
 
 - `path` `(string: "")` – The file system path where all the Vault data gets