diff --git a/docs/en_US/release_notes_5_2.rst b/docs/en_US/release_notes_5_2.rst
index 10ed1aa19..8ddf82f35 100644
--- a/docs/en_US/release_notes_5_2.rst
+++ b/docs/en_US/release_notes_5_2.rst
@@ -31,3 +31,4 @@ Bug fixes
 | `Issue #6344 <https://redmine.postgresql.org/issues/6344>`_ -  Fixed cannot unpack non-iterable response object error when selecting any partition.
 | `Issue #6356 <https://redmine.postgresql.org/issues/6356>`_ -  Mark the Apache HTTPD config file as such in the web DEB and RPM packages.
 | `Issue #6375 <https://redmine.postgresql.org/issues/6375>`_ -  Fixed an issue where users are unable to see data of the partitions using the View/Edit data option.
+| `Issue #6376 <https://redmine.postgresql.org/issues/6376>`_ -  Fixed an issue where a connection warning should be displayed on the user clicks on explain or explain analyze and the database server is disconnected from the browser tree.
diff --git a/web/pgadmin/tools/sqleditor/utils/apply_explain_plan_wrapper.py b/web/pgadmin/tools/sqleditor/utils/apply_explain_plan_wrapper.py
index 544e0976c..162b980cb 100644
--- a/web/pgadmin/tools/sqleditor/utils/apply_explain_plan_wrapper.py
+++ b/web/pgadmin/tools/sqleditor/utils/apply_explain_plan_wrapper.py
@@ -16,8 +16,9 @@ from pgadmin.utils.compile_template_name import compile_template_name
 def apply_explain_plan_wrapper_if_needed(manager, sql):
     if 'explain_plan' in sql and sql['explain_plan']:
         explain_plan = sql['explain_plan']
-        ver = manager.version
-        server_type = manager.server_type
+        ver = manager.version if manager.version is not None else 0
+        server_type = \
+            manager.server_type if manager.server_type is not None else 'pg'
         template_path = compile_template_name(
             'sqleditor/sql',
             'explain_plan.sql',