diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64381784d5da..ee2337259c7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 ### CLI
 
+#### New features
+
+- Add `--graphql-linter-enabled` option, to control whether the linter should enabled or not for GraphQL files. Contributed by @ematipico
+
 ### Configuration
 
 - Add support for loading configuration from `.editorconfig` files ([#1724](https://github.com/biomejs/biome/issues/1724)). Contributed by @dyc3
@@ -69,6 +73,10 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
   Contributed by @Conaclos
 
+#### New features
+
+- Add support for GraphQL linting. Contributed by @ematipico
+
 #### Bug fixes
 
 - Don't request alt text for elements hidden from assistive technologies ([#3316](https://github.com/biomejs/biome/issues/3316)). Contributed by @robintown
diff --git a/crates/biome_cli/src/commands/format.rs b/crates/biome_cli/src/commands/format.rs
index c90b466f8464..f865f712c378 100644
--- a/crates/biome_cli/src/commands/format.rs
+++ b/crates/biome_cli/src/commands/format.rs
@@ -10,7 +10,7 @@ use crate::{
 use biome_configuration::vcs::PartialVcsConfiguration;
 use biome_configuration::{
     PartialCssFormatter, PartialFilesConfiguration, PartialFormatterConfiguration,
-    PartialJavascriptFormatter, PartialJsonFormatter,
+    PartialGraphqlFormatter, PartialJavascriptFormatter, PartialJsonFormatter,
 };
 use biome_console::{markup, ConsoleExt};
 use biome_deserialize::Merge;
@@ -27,6 +27,7 @@ pub(crate) struct FormatCommandPayload {
     pub(crate) javascript_formatter: Option<PartialJavascriptFormatter>,
     pub(crate) json_formatter: Option<PartialJsonFormatter>,
     pub(crate) css_formatter: Option<PartialCssFormatter>,
+    pub(crate) graphql_formatter: Option<PartialGraphqlFormatter>,
     pub(crate) formatter_configuration: Option<PartialFormatterConfiguration>,
     pub(crate) vcs_configuration: Option<PartialVcsConfiguration>,
     pub(crate) files_configuration: Option<PartialFilesConfiguration>,
@@ -57,6 +58,7 @@ pub(crate) fn format(
         fix,
         mut json_formatter,
         css_formatter,
+        graphql_formatter,
         since,
         staged,
         changed,
@@ -196,6 +198,11 @@ pub(crate) fn format(
         let css = configuration.css.get_or_insert_with(Default::default);
         css.formatter.merge_with(css_formatter);
     }
+    if graphql_formatter.is_some() {
+        let graphql = configuration.graphql.get_or_insert_with(Default::default);
+        graphql.formatter.merge_with(graphql_formatter);
+    }
+
     if javascript_formatter.is_some() {
         let javascript = configuration
             .javascript
diff --git a/crates/biome_cli/src/commands/lint.rs b/crates/biome_cli/src/commands/lint.rs
index e00631f89e1a..07dfdb14283b 100644
--- a/crates/biome_cli/src/commands/lint.rs
+++ b/crates/biome_cli/src/commands/lint.rs
@@ -12,7 +12,8 @@ use biome_configuration::json::PartialJsonLinter;
 use biome_configuration::linter::RuleSelector;
 use biome_configuration::vcs::PartialVcsConfiguration;
 use biome_configuration::{
-    PartialConfiguration, PartialFilesConfiguration, PartialLinterConfiguration,
+    PartialConfiguration, PartialFilesConfiguration, PartialGraphqlLinter,
+    PartialLinterConfiguration,
 };
 use biome_deserialize::Merge;
 use biome_service::configuration::{
@@ -43,6 +44,7 @@ pub(crate) struct LintCommandPayload {
     pub(crate) javascript_linter: Option<PartialJavascriptLinter>,
     pub(crate) json_linter: Option<PartialJsonLinter>,
     pub(crate) css_linter: Option<PartialCssLinter>,
+    pub(crate) graphql_linter: Option<PartialGraphqlLinter>,
 }
 
 /// Handler for the "lint" command of the Biome CLI
@@ -67,6 +69,7 @@ pub(crate) fn lint(session: CliSession, payload: LintCommandPayload) -> Result<(
         javascript_linter,
         css_linter,
         json_linter,
+        graphql_linter,
     } = payload;
     setup_cli_subscriber(cli_options.log_level, cli_options.log_kind);
 
@@ -118,6 +121,13 @@ pub(crate) fn lint(session: CliSession, payload: LintCommandPayload) -> Result<(
         let css = fs_configuration.css.get_or_insert_with(Default::default);
         css.linter.merge_with(css_linter);
     }
+
+    if graphql_linter.is_some() {
+        let graphql = fs_configuration
+            .graphql
+            .get_or_insert_with(Default::default);
+        graphql.linter.merge_with(graphql_linter);
+    }
     if javascript_linter.is_some() {
         let javascript = fs_configuration
             .javascript
diff --git a/crates/biome_cli/src/commands/mod.rs b/crates/biome_cli/src/commands/mod.rs
index 0b49de90d539..5323782b6bbd 100644
--- a/crates/biome_cli/src/commands/mod.rs
+++ b/crates/biome_cli/src/commands/mod.rs
@@ -9,12 +9,14 @@ use biome_configuration::javascript::PartialJavascriptLinter;
 use biome_configuration::json::PartialJsonLinter;
 use biome_configuration::linter::RuleSelector;
 use biome_configuration::{
-    css::partial_css_formatter, css::partial_css_linter, javascript::partial_javascript_formatter,
+    css::partial_css_formatter, css::partial_css_linter, graphql::partial_graphql_formatter,
+    graphql::partial_graphql_linter, javascript::partial_javascript_formatter,
     javascript::partial_javascript_linter, json::partial_json_formatter, json::partial_json_linter,
     partial_configuration, partial_files_configuration, partial_formatter_configuration,
     partial_linter_configuration, vcs::partial_vcs_configuration, vcs::PartialVcsConfiguration,
     PartialCssFormatter, PartialFilesConfiguration, PartialFormatterConfiguration,
-    PartialJavascriptFormatter, PartialJsonFormatter, PartialLinterConfiguration,
+    PartialGraphqlFormatter, PartialGraphqlLinter, PartialJavascriptFormatter,
+    PartialJsonFormatter, PartialLinterConfiguration,
 };
 use biome_configuration::{BiomeDiagnostic, PartialConfiguration};
 use biome_console::{markup, Console, ConsoleExt};
@@ -190,6 +192,9 @@ pub enum BiomeCommand {
         #[bpaf(external(partial_css_linter), optional, hide_usage, hide)]
         css_linter: Option<PartialCssLinter>,
 
+        #[bpaf(external(partial_graphql_linter), optional, hide_usage, hide)]
+        graphql_linter: Option<PartialGraphqlLinter>,
+
         #[bpaf(external, hide_usage)]
         cli_options: CliOptions,
 
@@ -246,6 +251,9 @@ pub enum BiomeCommand {
         #[bpaf(external(partial_css_formatter), optional, hide_usage, hide)]
         css_formatter: Option<PartialCssFormatter>,
 
+        #[bpaf(external(partial_graphql_formatter), optional, hide_usage, hide)]
+        graphql_formatter: Option<PartialGraphqlFormatter>,
+
         #[bpaf(external(partial_vcs_configuration), optional, hide_usage)]
         vcs_configuration: Option<PartialVcsConfiguration>,
 
diff --git a/crates/biome_cli/src/commands/rage.rs b/crates/biome_cli/src/commands/rage.rs
index 057c6ec1fec3..86a46b16b3ec 100644
--- a/crates/biome_cli/src/commands/rage.rs
+++ b/crates/biome_cli/src/commands/rage.rs
@@ -271,7 +271,7 @@ impl Display for RageConfiguration<'_, '_> {
                             configuration.get_graphql_formatter_configuration();
                         markup! (
                             {Section("GraphQL Formatter")}
-                            {KeyValuePair("Enabled", markup!({DebugDisplay(graphql_formatter_configuration.enabled)}))}
+                            {KeyValuePair("Enabled", markup!({DebugDisplayOption(graphql_formatter_configuration.enabled)}))}
                             {KeyValuePair("Indent style", markup!({DebugDisplayOption(graphql_formatter_configuration.indent_style)}))}
                             {KeyValuePair("Indent width", markup!({DebugDisplayOption(graphql_formatter_configuration.indent_width)}))}
                             {KeyValuePair("Line ending", markup!({DebugDisplayOption(graphql_formatter_configuration.line_ending)}))}
@@ -288,11 +288,13 @@ impl Display for RageConfiguration<'_, '_> {
                         let javascript_linter = configuration.get_javascript_linter_configuration();
                         let json_linter = configuration.get_json_linter_configuration();
                         let css_linter = configuration.get_css_linter_configuration();
+                        let graphq_linter = configuration.get_graphql_linter_configuration();
                         markup! (
                             {Section("Linter")}
                             {KeyValuePair("JavaScript enabled", markup!({DebugDisplay(javascript_linter.enabled)}))}
                             {KeyValuePair("JSON enabled", markup!({DebugDisplay(json_linter.enabled)}))}
                             {KeyValuePair("CSS enabled", markup!({DebugDisplay(css_linter.enabled)}))}
+                            {KeyValuePair("GraphQL enabled", markup!({DebugDisplayOption(graphq_linter.enabled)}))}
                             {KeyValuePair("Recommended", markup!({DebugDisplay(linter_configuration.recommended.unwrap_or_default())}))}
                             {KeyValuePair("All", markup!({DebugDisplay(linter_configuration.all.unwrap_or_default())}))}
                             {RageConfigurationLintRules("Enabled rules",linter_configuration)}
diff --git a/crates/biome_cli/src/lib.rs b/crates/biome_cli/src/lib.rs
index 9ab166f67b38..490fd738399b 100644
--- a/crates/biome_cli/src/lib.rs
+++ b/crates/biome_cli/src/lib.rs
@@ -135,6 +135,7 @@ impl<'app> CliSession<'app> {
                 css_linter,
                 javascript_linter,
                 json_linter,
+                graphql_linter,
             } => commands::lint::lint(
                 self,
                 LintCommandPayload {
@@ -157,6 +158,7 @@ impl<'app> CliSession<'app> {
                     css_linter,
                     javascript_linter,
                     json_linter,
+                    graphql_linter,
                 },
             ),
             BiomeCommand::Ci {
@@ -193,6 +195,7 @@ impl<'app> CliSession<'app> {
                 files_configuration,
                 json_formatter,
                 css_formatter,
+                graphql_formatter,
                 staged,
                 changed,
                 since,
@@ -210,6 +213,7 @@ impl<'app> CliSession<'app> {
                     files_configuration,
                     json_formatter,
                     css_formatter,
+                    graphql_formatter,
                     staged,
                     changed,
                     since,
diff --git a/crates/biome_cli/tests/cases/graphql.rs b/crates/biome_cli/tests/cases/graphql.rs
new file mode 100644
index 000000000000..7e8dee54a6c3
--- /dev/null
+++ b/crates/biome_cli/tests/cases/graphql.rs
@@ -0,0 +1,115 @@
+use crate::run_cli;
+use crate::snap_test::{assert_cli_snapshot, assert_file_contents, SnapshotPayload};
+use biome_console::BufferConsole;
+use biome_fs::MemoryFileSystem;
+use biome_service::DynRef;
+use bpaf::Args;
+use std::path::Path;
+
+const UNFORMATTED: &str = r#"type Query {
+            me: User
+}
+
+type User {   id: ID   name: String
+}"#;
+
+const FORMATTED: &str = "type Query {\n\tme: User\n}\n\ntype User {\n\tid: ID\n\tname: String\n}\n";
+
+const MISSING_REASON: &str = r#"query {
+  member @deprecated {
+		id
+	}
+}"#;
+
+#[test]
+fn format_graphql_files() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let file_path = Path::new("file.graphql");
+    fs.insert(file_path.into(), UNFORMATTED.as_bytes());
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from([("format"), file_path.as_os_str().to_str().unwrap()].as_slice()),
+    );
+
+    assert!(result.is_err(), "run_cli returned {result:?}");
+
+    assert_file_contents(&fs, file_path, UNFORMATTED);
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "format_graphql_files",
+        fs,
+        console,
+        result,
+    ));
+}
+
+#[test]
+fn format_and_write_graphql_files() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let file_path = Path::new("file.graphql");
+    fs.insert(file_path.into(), UNFORMATTED.as_bytes());
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from(
+            [
+                ("format"),
+                "--write",
+                file_path.as_os_str().to_str().unwrap(),
+            ]
+            .as_slice(),
+        ),
+    );
+
+    assert!(result.is_ok(), "run_cli returned {result:?}");
+
+    assert_file_contents(&fs, file_path, FORMATTED);
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "format_and_write_graphql_files",
+        fs,
+        console,
+        result,
+    ));
+}
+
+#[test]
+fn lint_single_rule() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let file_path = Path::new("file.graphql");
+    fs.insert(file_path.into(), MISSING_REASON.as_bytes());
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from(
+            [
+                ("lint"),
+                "--only=nursery/useDeprecatedReason",
+                file_path.as_os_str().to_str().unwrap(),
+            ]
+            .as_slice(),
+        ),
+    );
+
+    assert!(result.is_ok(), "run_cli returned {result:?}");
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "lint_single_rule",
+        fs,
+        console,
+        result,
+    ));
+}
diff --git a/crates/biome_cli/tests/cases/mod.rs b/crates/biome_cli/tests/cases/mod.rs
index fc3e960808d8..8c76695ba529 100644
--- a/crates/biome_cli/tests/cases/mod.rs
+++ b/crates/biome_cli/tests/cases/mod.rs
@@ -7,6 +7,7 @@ mod config_path;
 mod cts_files;
 mod diagnostics;
 mod editorconfig;
+mod graphql;
 mod handle_astro_files;
 mod handle_css_files;
 mod handle_svelte_files;
diff --git a/crates/biome_cli/tests/snapshots/main_cases_graphql/format_and_write_graphql_files.snap b/crates/biome_cli/tests/snapshots/main_cases_graphql/format_and_write_graphql_files.snap
new file mode 100644
index 000000000000..21ef37915e23
--- /dev/null
+++ b/crates/biome_cli/tests/snapshots/main_cases_graphql/format_and_write_graphql_files.snap
@@ -0,0 +1,23 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `file.graphql`
+
+```graphql
+type Query {
+	me: User
+}
+
+type User {
+	id: ID
+	name: String
+}
+
+```
+
+# Emitted Messages
+
+```block
+Formatted 1 file in <TIME>. Fixed 1 file.
+```
diff --git a/crates/biome_cli/tests/snapshots/main_cases_graphql/format_graphql_files.snap b/crates/biome_cli/tests/snapshots/main_cases_graphql/format_graphql_files.snap
new file mode 100644
index 000000000000..9c69399aeb9a
--- /dev/null
+++ b/crates/biome_cli/tests/snapshots/main_cases_graphql/format_graphql_files.snap
@@ -0,0 +1,53 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `file.graphql`
+
+```graphql
+type Query {
+            me: User
+}
+
+type User {   id: ID   name: String
+}
+```
+
+# Termination Message
+
+```block
+format ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Some errors were emitted while running checks.
+  
+
+
+```
+
+# Emitted Messages
+
+```block
+file.graphql format ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Formatter would have printed the following content:
+  
+    1 1 │   type Query {
+    2   │ - ············me:·User
+      2 │ + → me:·User
+    3 3 │   }
+    4 4 │   
+    5   │ - type·User·{···id:·ID···name:·String
+    6   │ - }
+      5 │ + type·User·{
+      6 │ + → id:·ID
+      7 │ + → name:·String
+      8 │ + }
+      9 │ + 
+  
+
+```
+
+```block
+Checked 1 file in <TIME>. No fixes applied.
+Found 1 error.
+```
diff --git a/crates/biome_cli/tests/snapshots/main_cases_graphql/lint_single_rule.snap b/crates/biome_cli/tests/snapshots/main_cases_graphql/lint_single_rule.snap
new file mode 100644
index 000000000000..f04a2a8a407b
--- /dev/null
+++ b/crates/biome_cli/tests/snapshots/main_cases_graphql/lint_single_rule.snap
@@ -0,0 +1,36 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `file.graphql`
+
+```graphql
+query {
+  member @deprecated {
+		id
+	}
+}
+```
+
+# Emitted Messages
+
+```block
+file.graphql:2:10 lint/nursery/useDeprecatedReason ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  ! The directive `@deprecated` should have a `reason` argument.
+  
+    1 │ query {
+  > 2 │   member @deprecated {
+      │          ^^^^^^^^^^^
+    3 │ 		id
+    4 │ 	}
+  
+  i Add a `reason` argument to the directive.
+  
+
+```
+
+```block
+Checked 1 file in <TIME>. No fixes applied.
+Found 1 warning.
+```
diff --git a/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap b/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap
index ef4daa6797ff..a2d47a64606f 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap
@@ -102,6 +102,7 @@ The configuration that is contained inside the file `biome.json`
                               Defaults to 80.
         --graphql-formatter-quote-style=<double|single>  The type of quotes used in GraphQL code. Defaults
                               to double.
+        --graphql-linter-enabled=<true|false>  Control the formatter for GraphQL files.
 
 Global options applied to all commands
         --colors=<off|force>  Set the formatting mode for markup: "off" prints everything as plain text,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap b/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap
index 69177775f6b7..dc56fa601af6 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap
@@ -104,6 +104,7 @@ The configuration that is contained inside the file `biome.json`
                               Defaults to 80.
         --graphql-formatter-quote-style=<double|single>  The type of quotes used in GraphQL code. Defaults
                               to double.
+        --graphql-linter-enabled=<true|false>  Control the formatter for GraphQL files.
 
 Global options applied to all commands
         --colors=<off|force>  Set the formatting mode for markup: "off" prints everything as plain text,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_rage/with_linter_configuration.snap b/crates/biome_cli/tests/snapshots/main_commands_rage/with_linter_configuration.snap
index a6c91d215d7a..9563543b9a60 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_rage/with_linter_configuration.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_rage/with_linter_configuration.snap
@@ -60,6 +60,7 @@ Linter:
   JavaScript enabled:           true
   JSON enabled:                 true
   CSS enabled:                  false
+  GraphQL enabled:              false
   Recommended:                  false
   All:                          false
   Enabled rules:
diff --git a/crates/biome_configuration/src/graphql.rs b/crates/biome_configuration/src/graphql.rs
index 2852fe6449eb..acc808812449 100644
--- a/crates/biome_configuration/src/graphql.rs
+++ b/crates/biome_configuration/src/graphql.rs
@@ -13,17 +13,21 @@ pub struct GraphqlConfiguration {
     /// GraphQL formatter options
     #[partial(type, bpaf(external(partial_graphql_formatter), optional))]
     pub formatter: GraphqlFormatter,
+
+    // GraphQL linter options
+    #[partial(type, bpaf(external(partial_graphql_linter), optional))]
+    pub linter: GraphqlLinter,
 }
 
 /// Options that changes how the GraphQL formatter behaves
-#[derive(Clone, Debug, Default, Deserialize, Eq, Partial, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, Partial, PartialEq, Serialize)]
 #[partial(derive(Bpaf, Clone, Deserializable, Eq, Merge, PartialEq))]
 #[partial(cfg_attr(feature = "schema", derive(schemars::JsonSchema)))]
 #[partial(serde(rename_all = "camelCase", default, deny_unknown_fields))]
 pub struct GraphqlFormatter {
     /// Control the formatter for GraphQL files.
     #[partial(bpaf(long("graphql-formatter-enabled"), argument("true|false"), optional))]
-    pub enabled: bool,
+    pub enabled: Option<bool>,
 
     /// The indent style applied to GraphQL files.
     #[partial(bpaf(
@@ -63,10 +67,24 @@ pub struct GraphqlFormatter {
     pub bracket_spacing: Option<BracketSpacing>,
 }
 
+impl Default for GraphqlFormatter {
+    fn default() -> Self {
+        Self {
+            enabled: Some(false),
+            indent_style: Default::default(),
+            indent_width: Default::default(),
+            line_ending: Default::default(),
+            line_width: Default::default(),
+            quote_style: Default::default(),
+            bracket_spacing: Default::default(),
+        }
+    }
+}
+
 impl PartialGraphqlFormatter {
     pub fn get_formatter_configuration(&self) -> GraphqlFormatter {
         GraphqlFormatter {
-            enabled: self.enabled.unwrap_or_default(),
+            enabled: self.enabled,
             indent_style: self.indent_style,
             indent_width: self.indent_width,
             line_ending: self.line_ending,
@@ -77,14 +95,48 @@ impl PartialGraphqlFormatter {
     }
 }
 
+/// Options that changes how the GraphQL linter behaves
+#[derive(Clone, Debug, Deserialize, Eq, Partial, PartialEq, Serialize)]
+#[partial(derive(Bpaf, Clone, Deserializable, Eq, Merge, PartialEq))]
+#[partial(cfg_attr(feature = "schema", derive(schemars::JsonSchema)))]
+#[partial(serde(rename_all = "camelCase", default, deny_unknown_fields))]
+pub struct GraphqlLinter {
+    /// Control the formatter for GraphQL files.
+    #[partial(bpaf(long("graphql-linter-enabled"), argument("true|false"), optional))]
+    pub enabled: Option<bool>,
+}
+
+impl Default for GraphqlLinter {
+    fn default() -> Self {
+        Self {
+            enabled: Some(false),
+        }
+    }
+}
+
+impl PartialGraphqlLinter {
+    pub fn get_linter_configuration(&self) -> GraphqlLinter {
+        GraphqlLinter {
+            enabled: self.enabled,
+        }
+    }
+}
+
 #[test]
-fn default_graphql() {
+fn default_graphql_formatter() {
     let graphql_configuration = GraphqlFormatter::default();
 
-    assert!(!graphql_configuration.enabled);
+    assert_eq!(graphql_configuration.enabled, Some(false));
     assert_eq!(graphql_configuration.indent_style, None);
     assert_eq!(graphql_configuration.indent_width, None);
     assert_eq!(graphql_configuration.line_ending, None);
     assert_eq!(graphql_configuration.line_width, None);
     assert_eq!(graphql_configuration.quote_style, None);
 }
+
+#[test]
+fn default_graphql_linter() {
+    let graphql_configuration = GraphqlLinter::default();
+
+    assert_eq!(graphql_configuration.enabled, Some(false));
+}
diff --git a/crates/biome_configuration/src/lib.rs b/crates/biome_configuration/src/lib.rs
index 3f00684014c1..b986ac30ca51 100644
--- a/crates/biome_configuration/src/lib.rs
+++ b/crates/biome_configuration/src/lib.rs
@@ -35,8 +35,8 @@ pub use formatter::{
     PlainIndentStyle,
 };
 pub use graphql::{
-    partial_graphql_configuration, GraphqlConfiguration, GraphqlFormatter,
-    PartialGraphqlConfiguration, PartialGraphqlFormatter,
+    partial_graphql_configuration, GraphqlConfiguration, GraphqlFormatter, GraphqlLinter,
+    PartialGraphqlConfiguration, PartialGraphqlFormatter, PartialGraphqlLinter,
 };
 pub use javascript::{
     partial_javascript_configuration, JavascriptConfiguration, JavascriptFormatter,
@@ -226,6 +226,17 @@ impl PartialConfiguration {
             })
             .unwrap_or_default()
     }
+    pub fn get_graphql_linter_configuration(&self) -> GraphqlLinter {
+        self.graphql
+            .as_ref()
+            .map(|f| {
+                f.linter
+                    .as_ref()
+                    .map(|f| f.get_linter_configuration())
+                    .unwrap_or_default()
+            })
+            .unwrap_or_default()
+    }
 
     pub fn get_graphql_formatter_configuration(&self) -> GraphqlFormatter {
         self.graphql
diff --git a/crates/biome_graphql_formatter/tests/spec_test.rs b/crates/biome_graphql_formatter/tests/spec_test.rs
index ed125c1b6a74..ddcb7350dff2 100644
--- a/crates/biome_graphql_formatter/tests/spec_test.rs
+++ b/crates/biome_graphql_formatter/tests/spec_test.rs
@@ -36,6 +36,7 @@ pub fn run(spec_input_file: &str, _expected_file: &str, test_directory: &str, _f
                     enabled: Some(true),
                     ..Default::default()
                 }),
+                ..Default::default()
             }),
             ..Default::default()
         },
diff --git a/crates/biome_service/Cargo.toml b/crates/biome_service/Cargo.toml
index b24016b24ac6..c85552497fe3 100644
--- a/crates/biome_service/Cargo.toml
+++ b/crates/biome_service/Cargo.toml
@@ -74,8 +74,6 @@ schema = [
   "biome_graphql_syntax/schema",
 ]
 
-graphql = []
-
 [dev-dependencies]
 insta        = { workspace = true }
 tests_macros = { workspace = true }
diff --git a/crates/biome_service/src/file_handlers/graphql.rs b/crates/biome_service/src/file_handlers/graphql.rs
index c9cf262b6680..fd774df29e86 100644
--- a/crates/biome_service/src/file_handlers/graphql.rs
+++ b/crates/biome_service/src/file_handlers/graphql.rs
@@ -60,9 +60,23 @@ impl Default for GraphqlFormatterSettings {
     }
 }
 
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct GraphqlLinterSettings {
+    pub enabled: Option<bool>,
+}
+
+impl Default for GraphqlLinterSettings {
+    fn default() -> Self {
+        Self {
+            enabled: Some(false),
+        }
+    }
+}
+
 impl ServiceLanguage for GraphqlLanguage {
     type FormatterSettings = GraphqlFormatterSettings;
-    type LinterSettings = ();
+    type LinterSettings = GraphqlLinterSettings;
     type OrganizeImportsSettings = ();
     type FormatOptions = GraphqlFormatOptions;
     type ParserSettings = ();
@@ -208,7 +222,7 @@ fn debug_formatter_ir(
     Ok(root_element.to_string())
 }
 
-#[tracing::instrument(level = "debug", skip(parse))]
+#[tracing::instrument(level = "debug", skip(parse, settings))]
 fn format(
     biome_path: &BiomePath,
     document_file_source: &DocumentFileSource,
diff --git a/crates/biome_service/src/file_handlers/mod.rs b/crates/biome_service/src/file_handlers/mod.rs
index 6452a7ca2160..96fb667905f4 100644
--- a/crates/biome_service/src/file_handlers/mod.rs
+++ b/crates/biome_service/src/file_handlers/mod.rs
@@ -96,11 +96,10 @@ impl DocumentFileSource {
         if let Ok(file_source) = CssFileSource::try_from_well_known(file_name) {
             return Ok(file_source.into());
         }
-        if cfg!(feature = "graphql") || cfg!(debug_assertions) {
-            if let Ok(file_source) = GraphqlFileSource::try_from_well_known(file_name) {
-                return Ok(file_source.into());
-            }
+        if let Ok(file_source) = GraphqlFileSource::try_from_well_known(file_name) {
+            return Ok(file_source.into());
         }
+
         Err(FileSourceError::UnknownFileName(file_name.into()))
     }
 
@@ -120,10 +119,8 @@ impl DocumentFileSource {
         if let Ok(file_source) = CssFileSource::try_from_extension(extension) {
             return Ok(file_source.into());
         }
-        if cfg!(feature = "graphql") || cfg!(debug_assertions) {
-            if let Ok(file_source) = GraphqlFileSource::try_from_extension(extension) {
-                return Ok(file_source.into());
-            }
+        if let Ok(file_source) = GraphqlFileSource::try_from_extension(extension) {
+            return Ok(file_source.into());
         }
         Err(FileSourceError::UnknownExtension(
             Default::default(),
@@ -147,10 +144,8 @@ impl DocumentFileSource {
         if let Ok(file_source) = CssFileSource::try_from_language_id(language_id) {
             return Ok(file_source.into());
         }
-        if cfg!(feature = "graphql") || cfg!(debug_assertions) {
-            if let Ok(file_source) = GraphqlFileSource::try_from_language_id(language_id) {
-                return Ok(file_source.into());
-            }
+        if let Ok(file_source) = GraphqlFileSource::try_from_language_id(language_id) {
+            return Ok(file_source.into());
         }
         Err(FileSourceError::UnknownLanguageId(language_id.into()))
     }
@@ -297,7 +292,7 @@ impl DocumentFileSource {
                 EmbeddingKind::None => true,
             },
             DocumentFileSource::Json(_) | DocumentFileSource::Css(_) => true,
-            DocumentFileSource::Graphql(_) => cfg!(feature = "graphql") || cfg!(debug_assertions),
+            DocumentFileSource::Graphql(_) => true,
             DocumentFileSource::Unknown => false,
         }
     }
diff --git a/crates/biome_service/src/settings.rs b/crates/biome_service/src/settings.rs
index a57ca6a40843..19957e981d3b 100644
--- a/crates/biome_service/src/settings.rs
+++ b/crates/biome_service/src/settings.rs
@@ -547,6 +547,11 @@ impl From<PartialGraphqlConfiguration> for LanguageSettings<GraphqlLanguage> {
             language_setting.formatter.bracket_spacing = formatter.bracket_spacing;
         }
 
+        if let Some(linter) = graphql.linter {
+            // TODO: change RHS to `linter.enabled` when graphql linting is enabled by default
+            language_setting.linter.enabled = Some(linter.enabled.unwrap_or_default());
+        }
+
         language_setting
     }
 }
diff --git a/crates/biome_wasm/Cargo.toml b/crates/biome_wasm/Cargo.toml
index 7175a576b3ef..4d6b8d30aabe 100644
--- a/crates/biome_wasm/Cargo.toml
+++ b/crates/biome_wasm/Cargo.toml
@@ -17,7 +17,6 @@ crate-type = ["cdylib", "rlib"]
 
 [features]
 default = ["console_error_panic_hook"]
-graphql = ["biome_service/graphql"]
 
 [dependencies]
 biome_console      = { workspace = true }
diff --git a/packages/@biomejs/backend-jsonrpc/src/workspace.ts b/packages/@biomejs/backend-jsonrpc/src/workspace.ts
index 9bcc88f7c8a5..99ddac35e63f 100644
--- a/packages/@biomejs/backend-jsonrpc/src/workspace.ts
+++ b/packages/@biomejs/backend-jsonrpc/src/workspace.ts
@@ -179,6 +179,7 @@ export interface PartialGraphqlConfiguration {
 	 * GraphQL formatter options
 	 */
 	formatter?: PartialGraphqlFormatter;
+	linter?: PartialGraphqlLinter;
 }
 /**
  * A set of options applied to the JavaScript files
@@ -380,6 +381,15 @@ export interface PartialGraphqlFormatter {
 	 */
 	quoteStyle?: QuoteStyle;
 }
+/**
+ * Options that changes how the GraphQL linter behaves
+ */
+export interface PartialGraphqlLinter {
+	/**
+	 * Control the formatter for GraphQL files.
+	 */
+	enabled?: boolean;
+}
 /**
  * Formatting options specific to the JavaScript files
  */
diff --git a/packages/@biomejs/biome/configuration_schema.json b/packages/@biomejs/biome/configuration_schema.json
index 0de5597190bd..75214586604a 100644
--- a/packages/@biomejs/biome/configuration_schema.json
+++ b/packages/@biomejs/biome/configuration_schema.json
@@ -1168,6 +1168,12 @@
 						{ "$ref": "#/definitions/GraphqlFormatter" },
 						{ "type": "null" }
 					]
+				},
+				"linter": {
+					"anyOf": [
+						{ "$ref": "#/definitions/GraphqlLinter" },
+						{ "type": "null" }
+					]
 				}
 			},
 			"additionalProperties": false
@@ -1213,6 +1219,17 @@
 			},
 			"additionalProperties": false
 		},
+		"GraphqlLinter": {
+			"description": "Options that changes how the GraphQL linter behaves",
+			"type": "object",
+			"properties": {
+				"enabled": {
+					"description": "Control the formatter for GraphQL files.",
+					"type": ["boolean", "null"]
+				}
+			},
+			"additionalProperties": false
+		},
 		"Hook": {
 			"type": "object",
 			"required": ["name", "stableResult"],