diff --git a/frontend/package.json b/frontend/package.json
index 8fefe52d8cf..886bcbe2dec 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -52,8 +52,8 @@
     "@marimo-team/codemirror-ai": "^0.3.2",
     "@marimo-team/codemirror-languageserver": "^1.15.24",
     "@marimo-team/codemirror-mcp": "^0.1.5",
+    "@marimo-team/codemirror-sql": "^0.2.1",
     "@marimo-team/llm-info": "workspace:*",
-    "@marimo-team/codemirror-sql": "^0.1.3",
     "@marimo-team/marimo-api": "workspace:*",
     "@marimo-team/react-slotz": "^0.2.0",
     "@mui/material": "^6.4.12",
@@ -142,12 +142,12 @@
     "react-hook-form": "7.54.2",
     "react-markdown": "^9.1.0",
     "react-plotly.js": "^2.6.0",
-    "remark-gfm": "^4.0.0",
     "react-resizable-panels": "2.1.9",
     "react-use-event-hook": "^0.9.6",
     "react-vega": "^7.6.0",
     "react-virtuoso": "^4.13.0",
     "reactflow": "^11.11.4",
+    "remark-gfm": "^4.0.0",
     "rpc-anywhere": "^1.7.0",
     "sql-formatter": "^15.6.6",
     "string-dedent": "^3.0.2",
diff --git a/frontend/src/core/codemirror/language/languages/sql/utils.ts b/frontend/src/core/codemirror/language/languages/sql/utils.ts
index 65457e4fae8..b85e18a327c 100644
--- a/frontend/src/core/codemirror/language/languages/sql/utils.ts
+++ b/frontend/src/core/codemirror/language/languages/sql/utils.ts
@@ -12,7 +12,10 @@ import {
   SQLite,
   StandardSQL,
 } from "@codemirror/lang-sql";
-import { DuckDBDialect } from "@marimo-team/codemirror-sql/dialects";
+import {
+  BigQueryDialect,
+  DuckDBDialect,
+} from "@marimo-team/codemirror-sql/dialects";
 import type { DataSourceConnection } from "@/core/kernel/messages";
 
 export function guessDialect(
@@ -38,6 +41,8 @@ export function guessDialect(
     case "oracledb":
     case "oracle":
       return PLSQL;
+    case "bigquery":
+      return BigQueryDialect;
     default:
       return undefined;
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ee415184221..90eb0506688 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -137,8 +137,8 @@ importers:
         specifier: ^0.1.5
         version: 0.1.5(@codemirror/autocomplete@6.18.6)(@codemirror/state@6.5.2)(@codemirror/view@6.38.1)(@modelcontextprotocol/sdk@1.17.2)
       '@marimo-team/codemirror-sql':
-        specifier: ^0.1.3
-        version: 0.1.3(@codemirror/state@6.5.2)(@codemirror/view@6.38.1)
+        specifier: ^0.2.1
+        version: 0.2.1(@codemirror/state@6.5.2)(@codemirror/view@6.38.1)
       '@marimo-team/llm-info':
         specifier: workspace:*
         version: link:../packages/llm-info
@@ -1814,8 +1814,8 @@ packages:
       '@codemirror/view': ^6
       '@modelcontextprotocol/sdk': ^1
 
-  '@marimo-team/codemirror-sql@0.1.3':
-    resolution: {integrity: sha512-3qx3lzLfxl8x4F4aDxor4lmMFds9xBdkxvWRcU1ILmjXtsnnoStG0BHuMlTpmx7up+sOjGosr0JGGaHycHmZYQ==}
+  '@marimo-team/codemirror-sql@0.2.1':
+    resolution: {integrity: sha512-k/5IwEOIdSUB7wVoazF5qqhogOwaCW63Wpfk0uQ0oc1r5pNolfC0h6ZdZuf+pIHzkWun2u2dg0rMc9UOFtzIHQ==}
     peerDependencies:
       '@codemirror/state': ^6
       '@codemirror/view': ^6
@@ -11230,7 +11230,7 @@ snapshots:
       '@codemirror/view': 6.38.1
       '@modelcontextprotocol/sdk': 1.17.2
 
-  '@marimo-team/codemirror-sql@0.1.3(@codemirror/state@6.5.2)(@codemirror/view@6.38.1)':
+  '@marimo-team/codemirror-sql@0.2.1(@codemirror/state@6.5.2)(@codemirror/view@6.38.1)':
     dependencies:
       '@codemirror/autocomplete': 6.18.6
       '@codemirror/lint': 6.8.5