diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index cb8014a889..a3d4908e15 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -52,7 +52,7 @@
 				"minimatch": "^10.0.1",
 				"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~19.1.4",
 				"monaco-editor-wrapper": "6.10.0",
-				"monaco-graphql": "^1.6.2",
+				"monaco-graphql": "=1.6.0",
 				"monaco-languageclient": "9.9.0",
 				"monaco-vim": "^0.4.1",
 				"ol": "^7.4.0",
@@ -9087,16 +9087,16 @@
 			}
 		},
 		"node_modules/monaco-graphql": {
-			"version": "1.7.2",
-			"resolved": "https://registry.npmjs.org/monaco-graphql/-/monaco-graphql-1.7.2.tgz",
-			"integrity": "sha512-iLw1L+pfQOISXGTLWRwjSrxcdP3pjS9ljJmerf2EfvTLBjGc1uwhRd+hnA8/LQVr7RXjrHVPkR6ToKVAvTOBEA==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/monaco-graphql/-/monaco-graphql-1.6.0.tgz",
+			"integrity": "sha512-KFANLCtgsaHhLAqxiIbwjGwjsO19j1vQhw1iSgaewxr1/RfUEs5FBoUVfq3JITrpgLjBahfcgIWlB0mdgb9RgA==",
 			"license": "MIT",
 			"dependencies": {
-				"graphql-language-service": "^5.5.0",
+				"graphql-language-service": "^5.3.0",
 				"picomatch-browser": "^2.2.6"
 			},
 			"peerDependencies": {
-				"graphql": "^15.5.0 || ^16.0.0 || ^17.0.0",
+				"graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2",
 				"monaco-editor": ">= 0.20.0 < 1",
 				"prettier": "^2.8.0 || ^3.0.0"
 			}
diff --git a/frontend/package.json b/frontend/package.json
index 8c9f69fb26..cc8e5e170e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -119,7 +119,7 @@
 		"minimatch": "^10.0.1",
 		"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~19.1.4",
 		"monaco-editor-wrapper": "6.10.0",
-		"monaco-graphql": "^1.6.2",
+		"monaco-graphql": "=1.6.0",
 		"monaco-languageclient": "9.9.0",
 		"monaco-vim": "^0.4.1",
 		"ol": "^7.4.0",
diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index 03a7549a04..f87322d76f 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -110,8 +110,8 @@
 	import type { Text } from 'yjs'
 	import { initializeVscode, keepModelAroundToAvoidDisposalOfWorkers } from '$lib/components/vscode'
 
-	// import { initializeMode } from 'monaco-graphql/esm/initializeMode.js'
-	// import type { MonacoGraphQLAPI } from 'monaco-graphql/esm/api.js'
+	import { initializeMode } from 'monaco-graphql/esm/initializeMode.js'
+	import type { MonacoGraphQLAPI } from 'monaco-graphql/esm/api.js'
 
 	import {
 		editor as meditor,
@@ -237,7 +237,7 @@
 	let nbWsAttempt = 0
 	let disposeMethod: (() => void) | undefined
 	const dispatch = createEventDispatcher()
-	// let graphqlService: MonacoGraphQLAPI | undefined = undefined
+	let graphqlService: MonacoGraphQLAPI | undefined = undefined
 
 	let dbSchema: DBSchema | undefined = $state(undefined)
 
@@ -563,7 +563,7 @@
 		sqlSchemaCompletor?.dispose()
 	}
 	function disposeGaphqlService() {
-		// graphqlService = undefined
+		graphqlService = undefined
 	}
 
 	function addDBSchemaCompletions() {
@@ -573,14 +573,14 @@
 		}
 		console.log('adding db schema completions', schemaLang)
 		if (schemaLang === 'graphql') {
-			// graphqlService ||= initializeMode()
+			graphqlService ||= initializeMode()
 			console.log('setting schema config', schema)
-			// graphqlService?.setSchemaConfig([
-			// 	{
-			// 		uri: 'my-schema.graphql',
-			// 		introspectionJSON: schema
-			// 	}
-			// ])
+			graphqlService?.setSchemaConfig([
+				{
+					uri: 'my-schema.graphql',
+					introspectionJSON: schema
+				}
+			])
 		} else {
 			if (sqlSchemaCompletor) {
 				sqlSchemaCompletor.dispose()