diff --git a/packages/api/src/storageModel.js b/packages/api/src/storageModel.js
index 0202f1641..7fb993670 100644
--- a/packages/api/src/storageModel.js
+++ b/packages/api/src/storageModel.js
@@ -1533,6 +1533,12 @@ module.exports = {
           "columnName": "name",
           "dataType": "varchar(250)",
           "notNull": true
+        },
+        {
+          "pureName": "team_file_types",
+          "columnName": "format",
+          "dataType": "varchar(50)",
+          "notNull": false
         }
       ],
       "foreignKeys": [],
@@ -1549,7 +1555,13 @@ module.exports = {
       "preloadedRows": [
         {
           "id": -1,
-          "name": "sql"
+          "name": "sql",
+          "format": "text"
+        },
+        {
+          "id": -2,
+          "name": "diagrams",
+          "format": "json"
         }
       ]
     },
diff --git a/packages/web/src/modals/SaveFileModal.svelte b/packages/web/src/modals/SaveFileModal.svelte
index a069d57f9..6dcf13c4b 100644
--- a/packages/web/src/modals/SaveFileModal.svelte
+++ b/packages/web/src/modals/SaveFileModal.svelte
@@ -43,9 +43,9 @@
     const { name, cloudFolder } = e.detail;
     if ($values['saveToTeamFolder']) {
       const resp = await apiCall('team-files/create-new', { fileType: folder, file: name, data });
-      if (resp.apiErrorMessage) {
+      if (resp?.apiErrorMessage) {
         showSnackbarError(resp.apiErrorMessage);
-      } else if (resp.teamFileId) {
+      } else if (resp?.teamFileId) {
         closeCurrentModal();
         if (onSave) {
           onSave(name, {
@@ -57,6 +57,8 @@
             savedTeamFileId: resp.teamFileId,
           });
         }
+      } else {
+        showSnackbarError('Failed to save to team folder.');
       }
     } else if (cloudFolder === '__local') {
       await apiCall('files/save', { folder, file: name, data, format });
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index facb19f1a..7f1963bc8 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -52,6 +52,7 @@
     findReplace: true,
     executeAdditionalCondition: () => getCurrentEditor()?.hasConnection() && hasPermission('dbops/query'),
     copyPaste: true,
+    defaultTeamFolder: true,
   });
   registerCommand({
     id: 'query.executeCurrent',