diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index 6b39dbf9e..78cdf149f 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_5_6
    release_notes_5_5
    release_notes_5_4
    release_notes_5_3
diff --git a/docs/en_US/release_notes_5_6.rst b/docs/en_US/release_notes_5_6.rst
new file mode 100644
index 000000000..9c78e938c
--- /dev/null
+++ b/docs/en_US/release_notes_5_6.rst
@@ -0,0 +1,20 @@
+************
+Version 5.6
+************
+
+Release date: 2021-08-12
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 5.5.
+
+New features
+************
+
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+| `Issue #6580 <https://redmine.postgresql.org/issues/6580>`_ -  Fixed TypeError 'NoneType' object is not sub scriptable.
diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py
index 2a1c959fd..dd03242a6 100644
--- a/web/pgadmin/__init__.py
+++ b/web/pgadmin/__init__.py
@@ -681,15 +681,15 @@ def create_app(app_name=None):
         from pgadmin.utils.driver import get_driver
         from flask import current_app
 
-        # remove key
-        current_app.keyManager.reset()
-
         for mdl in current_app.logout_hooks:
             try:
                 mdl.on_logout(user)
             except Exception as e:
                 current_app.logger.exception(e)
 
+        # remove key
+        current_app.keyManager.reset()
+
         _driver = get_driver(PG_DEFAULT_DRIVER)
         _driver.gc_own()