diff --git a/contrib/pg_tde/documentation/docs/how-to/uninstall.md b/contrib/pg_tde/documentation/docs/how-to/uninstall.md
index 16a97e179a86e..792db880c165e 100644
--- a/contrib/pg_tde/documentation/docs/how-to/uninstall.md
+++ b/contrib/pg_tde/documentation/docs/how-to/uninstall.md
@@ -2,11 +2,12 @@
 
 If you no longer wish to use TDE in your deployment, you can remove the `pg_tde` extension. To do so, you must have superuser privileges, or database owner privileges in case you only want to remove it from a single database.
 
-!!! warning
-    This process removes the extension, but does not decrypt data automatically.  Only uninstall the extension after all encrypted data **has been removed or decrypted**.
-
 To uninstall `pg_tde`, follow these steps:
 
+## 1. Drop the pg_tde extension from all databases
+
+For all databases where the extensions is loaded you need to follow these steps. This also includes the template databases, in case `pg_tde` was previously enabled there.
+
 1. Decrypt or drop encrypted tables:
 
     Before removing the extension, you must either **decrypt** or **drop** all encrypted tables:
@@ -25,6 +26,8 @@ To uninstall `pg_tde`, follow these steps:
     DROP EXTENSION pg_tde;
     ```
 
+    If there are any encrypted objects that were not previously decrypted or deleted, this command will fail and you have to follow the step above for these objects.
+
     Alternatively, to remove everything at once:
 
     ```sql
@@ -34,17 +37,60 @@ To uninstall `pg_tde`, follow these steps:
     !!! note
         The `DROP EXTENSION` command does not delete the underlying `pg_tde`-specific data files from disk.
 
-3. Run the `DROP EXTENSION` command against every database where you have enabled the `pg_tde` extension, if the goal is to completely remove the extension. This also includes the template databases, in case `pg_tde` was previously enabled there.
+## 2. Turn off WAL encryption
 
-4. Remove any reference to `pg_tde` GUC variables from the PostgreSQL configuration file.
+If you are using  WAL encryption it needs to be turned off before the pg_tde library can be uninstalled.
 
-5. Modify the `shared_preload_libraries` and remove the 'pg_tde' from it. Use the `ALTER SYSTEM` command for this purpose, or edit the configuration file.
+1. Run `ALTER SYSTEM SET pg_tde.wal_encrypt=off;`
 
-    !!! warning
-        Once `pg_tde` is removed from the `shared_preload_libraries`, reading any leftover encrypted files will fail. Removing the extension from the `shared_preload_libraries` is also possible if the extension is still installed in some databases.
-        Make sure to do this only if the server has no encrypted files in its data directory.
+2. Restart the `postgresql` cluster to apply the changes.
+
+    * On Debian and Ubuntu:
+
+       ```sh
+       sudo systemctl restart postgresql
+       ```
+
+    * On RHEL and derivatives
+
+       ```sh
+       sudo systemctl restart postgresql-17
+
+## 3. Uninstall the pg_tde shared library
+
+!!! warning
+    This process removes the extension, but does not decrypt data automatically. Only uninstall the shared library after all encrypted data **has been removed or decrypted** and WAL encryption **has been disabled**.
 
-6. Start or restart the `postgresql` cluster to apply the changes.
+!!! note
+    Encrypted WAL pages will not be decrypted, so any postgres cluster needing to read them will need the `pg_tde` library loaded, and the WAL encryption keys used available.
+
+At this point, the shared library is still loaded but inactive. Follow these steps to completely uninstall it.
+
+1. Run `SHOW shared_preload_libraries` to view the current configuration of preloaded libraries.
+    Example:
+    ```
+    postgres=# SHOW shared_preload_libraries;
+            shared_preload_libraries
+    -----------------------------------------
+    pg_stat_statements,pg_tde,auto_explain
+    (1 row)
+
+    postgres=#
+    ```
+2. Remove `pg_tde` from the list and apply the new setting using `ALTER SYSTEM SET shared_preload_libraries=<your list of libraries>`
+    Example:
+    ```
+    postgres=# ALTER SYSTEM SET shared_preload_libraries=pg_stat_statements,auto_explain;
+    ALTER SYSTEM
+    postgres=#
+    ```
+    !!! note
+        Your list of libraries will most likely be different than in this example.
+
+    !!! note
+        If `pg_tde` is the only shared library in the list, and this is set using `postgresql.conf`, there is no way to disable it using `ALTER SYSTEM SET ...`. Instead remove the `shared_preload_libraries` line from `postgresql.conf` and then run `ALTER SYSTEM RESET shared_preload_libraries;`.
+
+3. Restart the `postgresql` cluster to apply the changes.
 
     * On Debian and Ubuntu:
 
@@ -57,3 +103,16 @@ To uninstall `pg_tde`, follow these steps:
        ```sh
        sudo systemctl restart postgresql-17
        ```
+
+## 4. (optional) Cleanup
+
+    At this point it is safe to remove any configuration related to pg_tde from `postgresql.conf` and `postgresql.auto.conf`. These configuration options have the prefix `pg_tde.`
+
+## Potential issues
+    If WAL encryption wasn't fully disabled before the `pg_tde` library was uninstalled you may get an error message like this when trying to restart the cluster:
+
+    ```
+    2025-04-01 17:12:50.607 CEST [496385] PANIC:  could not locate a valid checkpoint record at 0/17B2580
+    ```
+
+    If this happens, re-add `pg_tde` to `shared_preload_libraries` before starting the cluster, and follow the instructions for turning off WAL encryption above before uninstalling the shared library.