diff --git a/docs/en_US/release_notes_4_25.rst b/docs/en_US/release_notes_4_25.rst
index 640a9e17e..a66368a09 100644
--- a/docs/en_US/release_notes_4_25.rst
+++ b/docs/en_US/release_notes_4_25.rst
@@ -24,6 +24,7 @@ Bug fixes
 *********
 
 | `Issue #3767 <https://redmine.postgresql.org/issues/3767>`_ -  Ensure that the original file format should be retained when saving the same file in SQL editor.
+| `Issue #4361 <https://redmine.postgresql.org/issues/4361>`_ -  Fixed ssh tunnel hang issue when the user tries to disconnect the server.
 | `Issue #4387 <https://redmine.postgresql.org/issues/4387>`_ -  Fixed an issue where the user is not able to insert the data if the table and columns name contains special characters.
 | `Issue #4810 <https://redmine.postgresql.org/issues/4810>`_ -  Fixed an issue where the user is not able to save the new row if the table is empty.
 | `Issue #5429 <https://redmine.postgresql.org/issues/5429>`_ -  Ensure that the Dictionaries drop-down shows all the dictionaries in the FTS configuration dialog.
diff --git a/web/pgadmin/utils/driver/psycopg2/server_manager.py b/web/pgadmin/utils/driver/psycopg2/server_manager.py
index ce11a31f1..742612826 100644
--- a/web/pgadmin/utils/driver/psycopg2/server_manager.py
+++ b/web/pgadmin/utils/driver/psycopg2/server_manager.py
@@ -508,7 +508,8 @@ WHERE db.oid = {0}""".format(did))
                     ssh_password=tunnel_password,
                     remote_bind_address=(self.host, self.port)
                 )
-
+            # flag tunnel threads in daemon mode to fix hang issue.
+            self.tunnel_object.daemon_forward_servers = True
             self.tunnel_object.start()
             self.tunnel_created = True
         except BaseSSHTunnelForwarderError as e: