From ff4c5392d6a1c3214f1b060b0caf0f4c3601d4a6 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Tue, 16 Aug 2022 15:29:57 +0530
Subject: [PATCH] Fixed crypt key is missing issue when logout from the
 pgAdmin. Fixes #7614

---
 docs/en_US/release_notes_6_13.rst | 1 +
 web/pgadmin/__init__.py           | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/en_US/release_notes_6_13.rst b/docs/en_US/release_notes_6_13.rst
index f71505daf..2e2016be8 100644
--- a/docs/en_US/release_notes_6_13.rst
+++ b/docs/en_US/release_notes_6_13.rst
@@ -35,3 +35,4 @@ Bug fixes
   | `Issue #7586 <https://redmine.postgresql.org/issues/7586>`_ -  Fixed an issue with rendering geometry when selecting a complete column.
   | `Issue #7587 <https://redmine.postgresql.org/issues/7587>`_ -  Ensure that the children of information_schema and pg_catalog node should be displayed.
   | `Issue #7608 <https://redmine.postgresql.org/issues/7608>`_ -  Fixed an issue where the cloud deployment wizard creates the cluster with the High Availability even if that option is not selected.
+  | `Issue #7614 <https://redmine.postgresql.org/issues/7614>`_ -  Fixed crypt key is missing issue when logout from the pgAdmin.
diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py
index 40cbe5c0c..5038dc8ce 100644
--- a/web/pgadmin/__init__.py
+++ b/web/pgadmin/__init__.py
@@ -704,12 +704,12 @@ def create_app(app_name=None):
             except Exception as e:
                 current_app.logger.exception(e)
 
-        # remove key
-        current_app.keyManager.reset()
-
         _driver = get_driver(PG_DEFAULT_DRIVER)
         _driver.gc_own()
 
+        # remove key
+        current_app.keyManager.reset()
+
     ##########################################################################
     # Load plugin modules
     ##########################################################################