diff --git a/web/pgadmin/browser/server_groups/servers/types.py b/web/pgadmin/browser/server_groups/servers/types.py
index a3932a93b59..a831582b9d4 100644
--- a/web/pgadmin/browser/server_groups/servers/types.py
+++ b/web/pgadmin/browser/server_groups/servers/types.py
@@ -203,7 +203,7 @@ def get_utility_path(self, sverison):
                     bin_path['binaryPath'].strip() != '':
                 return bin_path['binaryPath']
 
-            if bin_path['isDefault']:
+            if bin_path['isDefault'] and bin_path['binaryPath'] != '':
                 default_path = bin_path['binaryPath']
 
         return default_path
diff --git a/web/pgadmin/misc/workspaces/static/js/AdHocConnection.jsx b/web/pgadmin/misc/workspaces/static/js/AdHocConnection.jsx
index c9bda12427c..f03dba97562 100644
--- a/web/pgadmin/misc/workspaces/static/js/AdHocConnection.jsx
+++ b/web/pgadmin/misc/workspaces/static/js/AdHocConnection.jsx
@@ -465,7 +465,7 @@ export default function AdHocConnection({mode}) {
       });
       if (mode == WORKSPACES.QUERY_TOOL) {
         openQueryTool(respData, formData);
-      } else if (mode == WORKSPACES.PSQL_TOOL) {
+      } else if (mode == WORKSPACES.PSQL_TOOL && pgAdmin['enable_psql']) {
         openPSQLTool(respData, formData);
       }
     } catch (error) {
diff --git a/web/pgadmin/misc/workspaces/static/js/WorkspaceToolbar.jsx b/web/pgadmin/misc/workspaces/static/js/WorkspaceToolbar.jsx
index ea3aba02da1..76022262c44 100644
--- a/web/pgadmin/misc/workspaces/static/js/WorkspaceToolbar.jsx
+++ b/web/pgadmin/misc/workspaces/static/js/WorkspaceToolbar.jsx
@@ -125,7 +125,7 @@ export default function WorkspaceToolbar() {
     <Root>
       <WorkspaceButton icon={<AccountTreeRoundedIcon />} value={WORKSPACES.DEFAULT} title={gettext('Default Workspace')} tooltipPlacement="right" />
       <WorkspaceButton icon={<QueryToolIcon />} value={WORKSPACES.QUERY_TOOL} title={gettext('Query Tool Workspace')} tooltipPlacement="right" />
-      <WorkspaceButton icon={<TerminalRoundedIcon style={{height: '1.4rem'}}/>} value={WORKSPACES.PSQL_TOOL} title={gettext('PSQL Tool Workspace')} tooltipPlacement="right" />
+      {pgAdmin['enable_psql'] &&  <WorkspaceButton icon={<TerminalRoundedIcon style={{height: '1.4rem'}}/>} value={WORKSPACES.PSQL_TOOL} title={gettext('PSQL Tool Workspace')} tooltipPlacement="right" />}
       <WorkspaceButton icon={<SchemaDiffIcon />} value={WORKSPACES.SCHEMA_DIFF_TOOL} title={gettext('Schema Diff Workspace')} tooltipPlacement="right" />
       <Box marginTop="auto">
         <WorkspaceButton icon={<SettingsIcon />} menuItem={menus['settings']} title={gettext('Preferences')} tooltipPlacement="right" />