diff --git a/package.json b/package.json
index f48a000..1df184e 100644
--- a/package.json
+++ b/package.json
@@ -197,7 +197,7 @@
         },
         {
           "command": "vscode-postgres.runQuery",
-          "when": "editorLangId != postgres && editorHasSelection && !editorHasMultipleSelections"
+          "when": "editorLangId != postgres && config.vscode-postgres.defaultConnection != '' && config.vscode-postgres.defaultDatabase != '' && editorHasSelection && !editorHasMultipleSelections"
         },
         {
           "command": "vscode-postgres.selectTop",
@@ -215,7 +215,7 @@
       "editor/context": [
         {
           "command": "vscode-postgres.runQuery",
-          "when": "editorLangId != postgres && editorHasSelection && !editorHasMultipleSelections",
+          "when": "editorLangId != postgres && config.vscode-postgres.defaultConnection != '' && config.vscode-postgres.defaultDatabase != '' && editorHasSelection && !editorHasMultipleSelections",
           "group": "navigation"
         },
         {