diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf79a11c7e01..c22f545033d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -622,7 +622,6 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 #### New features
 
 - Add option `json.formatter.trailingComma`, to provide a better control over the trailing comma in JSON/JSONC files. Its default value is `"none"`.
-  When this option isn't provided, and you set the parser option `json.parser.allowTrailingComma` to `true`, the value of `json.formatter.trailingComma` is `"all"`.
 
 #### Bug fixes
 
diff --git a/crates/biome_cli/src/commands/rage.rs b/crates/biome_cli/src/commands/rage.rs
index 49cbe2633a81..ccd28d320619 100644
--- a/crates/biome_cli/src/commands/rage.rs
+++ b/crates/biome_cli/src/commands/rage.rs
@@ -263,7 +263,7 @@ impl Display for RageConfiguration<'_, '_> {
                             {KeyValuePair("Indent size", markup!({DebugDisplayOption(json_formatter_configuration.indent_size)}))}
                             {KeyValuePair("Line ending", markup!({DebugDisplayOption(json_formatter_configuration.line_ending)}))}
                             {KeyValuePair("Line width", markup!({DebugDisplayOption(json_formatter_configuration.line_width.map(|lw| lw.get()))}))}
-                            {KeyValuePair("Trailing Comma", markup!({DebugDisplayOption(json_formatter_configuration.trailing_comma)}))}
+                            {KeyValuePair("Trailing Commas", markup!({DebugDisplayOption(json_formatter_configuration.trailing_commas)}))}
                         ).fmt(fmt)?;
                     }
 
diff --git a/crates/biome_cli/src/execute/migrate.rs b/crates/biome_cli/src/execute/migrate.rs
index d1d96fa1b3e6..f2d9917b1842 100644
--- a/crates/biome_cli/src/execute/migrate.rs
+++ b/crates/biome_cli/src/execute/migrate.rs
@@ -63,7 +63,7 @@ pub(crate) fn run(migrate_payload: MigratePayload) -> Result<(), CliDiagnostic>
         path: biome_path.clone(),
         content: configuration_content.to_string(),
         version: 0,
-        document_file_source: JsonFileSource::json().into(),
+        document_file_source: Some(JsonFileSource::json().into()),
     })?;
 
     let parsed = parse_json_with_cache(
diff --git a/crates/biome_cli/src/execute/process_file/workspace_file.rs b/crates/biome_cli/src/execute/process_file/workspace_file.rs
index 29738d285d1b..6503c64c6baa 100644
--- a/crates/biome_cli/src/execute/process_file/workspace_file.rs
+++ b/crates/biome_cli/src/execute/process_file/workspace_file.rs
@@ -2,7 +2,7 @@ use crate::execute::diagnostics::{ResultExt, ResultIoExt};
 use crate::execute::process_file::SharedTraversalOptions;
 use biome_diagnostics::{category, Error};
 use biome_fs::{BiomePath, File, OpenOptions};
-use biome_service::workspace::{DocumentFileSource, FileGuard, OpenFileParams};
+use biome_service::workspace::{FileGuard, OpenFileParams};
 use biome_service::{Workspace, WorkspaceError};
 use std::path::{Path, PathBuf};
 
@@ -36,7 +36,7 @@ impl<'ctx, 'app> WorkspaceFile<'ctx, 'app> {
         let guard = FileGuard::open(
             ctx.workspace,
             OpenFileParams {
-                document_file_source: DocumentFileSource::from_path(&biome_path),
+                document_file_source: None,
                 path: biome_path,
                 version: 0,
                 content: input.clone(),
diff --git a/crates/biome_cli/src/execute/std_in.rs b/crates/biome_cli/src/execute/std_in.rs
index 9456364e6834..84635a263d10 100644
--- a/crates/biome_cli/src/execute/std_in.rs
+++ b/crates/biome_cli/src/execute/std_in.rs
@@ -8,9 +8,8 @@ use biome_diagnostics::Diagnostic;
 use biome_diagnostics::PrintDiagnostic;
 use biome_fs::BiomePath;
 use biome_service::workspace::{
-    ChangeFileParams, DocumentFileSource, FeaturesBuilder, FixFileParams, FormatFileParams,
-    OpenFileParams, OrganizeImportsParams, PullDiagnosticsParams, RuleCategories,
-    SupportsFeatureParams,
+    ChangeFileParams, FeaturesBuilder, FixFileParams, FormatFileParams, OpenFileParams,
+    OrganizeImportsParams, PullDiagnosticsParams, RuleCategories, SupportsFeatureParams,
 };
 use biome_service::WorkspaceError;
 use std::borrow::Cow;
@@ -49,7 +48,7 @@ pub(crate) fn run<'a>(
                 path: biome_path.clone(),
                 version: 0,
                 content: content.into(),
-                document_file_source: DocumentFileSource::default(),
+                document_file_source: None,
             })?;
             let printed = workspace.format_file(FormatFileParams { path: biome_path })?;
 
@@ -72,7 +71,7 @@ pub(crate) fn run<'a>(
             path: biome_path.clone(),
             version: 0,
             content: content.into(),
-            document_file_source: DocumentFileSource::default(),
+            document_file_source: None,
         })?;
         // apply fix file of the linter
         let file_features = workspace.file_features(SupportsFeatureParams {
diff --git a/crates/biome_cli/tests/commands/format.rs b/crates/biome_cli/tests/commands/format.rs
index b1ce5643dc6b..abec31458ed6 100644
--- a/crates/biome_cli/tests/commands/format.rs
+++ b/crates/biome_cli/tests/commands/format.rs
@@ -2265,7 +2265,7 @@ fn format_json_when_allow_trailing_commas_write() {
 
     assert!(result.is_ok(), "run_cli returned {result:?}");
 
-    assert_file_contents(&fs, Path::new(file_path), "{\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n}\n");
+    assert_file_contents(&fs, Path::new(file_path), "{\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\"\n}\n");
 
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
@@ -2284,7 +2284,7 @@ fn format_omits_json_trailing_comma() {
     let config_json = r#"{
     "json": {
         "parser": { "allowTrailingCommas": true },
-        "formatter": { "trailingComma": "none" }
+        "formatter": { "trailingCommas": "none" }
     }
 }"#;
     let biome_config = "biome.json";
@@ -2320,6 +2320,50 @@ fn format_omits_json_trailing_comma() {
     ));
 }
 
+#[test]
+fn format_omits_json_trailing_comma_omit() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let config_json = r#"{
+    "json": {
+        "parser": { "allowTrailingCommas": true },
+        "formatter": { "trailingCommas": "all" }
+    }
+}"#;
+    let biome_config = "biome.json";
+    let code = r#"{   "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar",
+}"#;
+    let file_path = Path::new("file.json");
+    fs.insert(file_path.into(), code.as_bytes());
+    fs.insert(biome_config.into(), config_json);
+
+    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, Path::new(file_path), "{\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n}\n");
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "format_omits_json_trailing_comma_omit",
+        fs,
+        console,
+        result,
+    ));
+}
+
 #[test]
 fn treat_known_json_files_as_jsonc_files() {
     let mut fs = MemoryFileSystem::default();
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 98beb9494a42..04073a73c6a3 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
@@ -70,7 +70,7 @@ The configuration that is contained inside the file `biome.json`
                               languages) files.
         --json-formatter-line-width=NUMBER  What's the max width of a line applied to JSON (and its super
                               languages) files. Defaults to 80.
-        --json-formatter-trailing-comma=<omit|allow>  Print trailing commas wherever possible in multi-line
+        --json-formatter-trailing-commas=<omit|allow>  Print trailing commas wherever possible in multi-line
                               comma-separated syntactic structures. Defaults to "omit".
 
 Global options applied to all commands
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 00866aa0180c..446f0cd56bea 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
@@ -72,7 +72,7 @@ The configuration that is contained inside the file `biome.json`
                               languages) files.
         --json-formatter-line-width=NUMBER  What's the max width of a line applied to JSON (and its super
                               languages) files. Defaults to 80.
-        --json-formatter-trailing-comma=<omit|allow>  Print trailing commas wherever possible in multi-line
+        --json-formatter-trailing-commas=<omit|allow>  Print trailing commas wherever possible in multi-line
                               comma-separated syntactic structures. Defaults to "omit".
 
 Global options applied to all commands
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap b/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap
index 4adbb8460705..394695de74d7 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap
@@ -106,7 +106,7 @@ Available options:
                               languages) files.
         --json-formatter-line-width=NUMBER  What's the max width of a line applied to JSON (and its super
                               languages) files. Defaults to 80.
-        --json-formatter-trailing-comma=<omit|allow>  Print trailing commas wherever possible in multi-line
+        --json-formatter-trailing-commas=<omit|allow>  Print trailing commas wherever possible in multi-line
                               comma-separated syntactic structures. Defaults to "omit".
         --stdin-file-path=PATH  Use this option when you want to format code piped from `stdin`, and
                               print the output to `stdout`.
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/format_json_when_allow_trailing_commas.snap b/crates/biome_cli/tests/snapshots/main_commands_format/format_json_when_allow_trailing_commas.snap
index 5b1c3d1f59b1..52547132a5ec 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_format/format_json_when_allow_trailing_commas.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/format_json_when_allow_trailing_commas.snap
@@ -45,7 +45,7 @@ file.json format ━━━━━━━━━━━━━━━━━━━━━
     3   │ - ········1,
     4   │ - ····],
     5   │ - }
-      2 │ + → "array":·[1],
+      2 │ + → "array":·[1]
       3 │ + }
       4 │ + 
   
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/format_json_when_allow_trailing_commas_write.snap b/crates/biome_cli/tests/snapshots/main_commands_format/format_json_when_allow_trailing_commas_write.snap
index c266c6725bc3..233f36f1bd0c 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_format/format_json_when_allow_trailing_commas_write.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/format_json_when_allow_trailing_commas_write.snap
@@ -20,7 +20,7 @@ expression: content
 	"loreum_ipsum_lorem_ipsum": "bar",
 	"loreum_ipsum_lorem_ipsum": "bar",
 	"loreum_ipsum_lorem_ipsum": "bar",
-	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar"
 }
 
 ```
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma.snap b/crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma.snap
index 958bbb46a3b2..872ff7d80021 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma.snap
@@ -8,7 +8,7 @@ expression: content
 {
   "json": {
     "parser": { "allowTrailingCommas": true },
-    "formatter": { "trailingComma": "none" }
+    "formatter": { "trailingCommas": "none" }
   }
 }
 ```
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma_omit.snap b/crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma_omit.snap
new file mode 100644
index 000000000000..943bf42e6a3f
--- /dev/null
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma_omit.snap
@@ -0,0 +1,35 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `biome.json`
+
+```json
+{
+  "json": {
+    "parser": { "allowTrailingCommas": true },
+    "formatter": { "trailingCommas": "all" }
+  }
+}
+```
+
+## `file.json`
+
+```json
+{
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+}
+
+```
+
+# Emitted Messages
+
+```block
+Formatted 1 file in <TIME>. Fixed 1 file.
+```
+
+
diff --git a/crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap b/crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap
index df6ea43aafb9..8880b111916c 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap
@@ -110,7 +110,7 @@ JSON Formatter:
   Indent size:                  unset
   Line ending:                  Lf
   Line width:                   100
-  Trailing Comma:               unset
+  Trailing Commas:              unset
 
 Server:
   Version:                      0.0.0
diff --git a/crates/biome_json_formatter/src/context.rs b/crates/biome_json_formatter/src/context.rs
index 76b67b3e6b63..3505561cf8ba 100644
--- a/crates/biome_json_formatter/src/context.rs
+++ b/crates/biome_json_formatter/src/context.rs
@@ -66,7 +66,7 @@ pub struct JsonFormatOptions {
     line_width: LineWidth,
     attribute_position: AttributePosition,
     /// Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "none".
-    trailing_comma: TrailingComma,
+    trailing_commas: TrailingCommas,
 }
 
 #[derive(Clone, Copy, Debug, Default, Eq, Hash, Deserializable, Merge, PartialEq)]
@@ -75,7 +75,7 @@ pub struct JsonFormatOptions {
     derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema),
     serde(rename_all = "camelCase")
 )]
-pub enum TrailingComma {
+pub enum TrailingCommas {
     #[default]
     /// The formatter will remove the trailing comma
     None,
@@ -83,23 +83,23 @@ pub enum TrailingComma {
     All,
 }
 
-impl FromStr for TrailingComma {
+impl FromStr for TrailingCommas {
     type Err = &'static str;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "none" => Ok(Self::None),
             "all" => Ok(Self::All),
-            _ => Err("Value not supported for TrailingComma"),
+            _ => Err("Value not supported for TrailingCommas"),
         }
     }
 }
 
-impl fmt::Display for TrailingComma {
+impl fmt::Display for TrailingCommas {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            TrailingComma::None => std::write!(f, "None"),
-            TrailingComma::All => std::write!(f, "All"),
+            TrailingCommas::None => std::write!(f, "None"),
+            TrailingCommas::All => std::write!(f, "All"),
         }
     }
 }
@@ -131,8 +131,8 @@ impl JsonFormatOptions {
         self
     }
 
-    pub fn with_trailing_comma(mut self, trailing_comma: TrailingComma) -> Self {
-        self.trailing_comma = trailing_comma;
+    pub fn with_trailing_comma(mut self, trailing_comma: TrailingCommas) -> Self {
+        self.trailing_commas = trailing_comma;
         self
     }
 
@@ -153,9 +153,9 @@ impl JsonFormatOptions {
     }
 
     pub(crate) fn to_trailing_separator(&self) -> TrailingSeparator {
-        match self.trailing_comma {
-            TrailingComma::None => TrailingSeparator::Omit,
-            TrailingComma::All => TrailingSeparator::Allowed,
+        match self.trailing_commas {
+            TrailingCommas::None => TrailingSeparator::Omit,
+            TrailingCommas::All => TrailingSeparator::Allowed,
         }
     }
 }
@@ -192,6 +192,6 @@ impl fmt::Display for JsonFormatOptions {
         writeln!(f, "Indent width: {}", self.indent_width.value())?;
         writeln!(f, "Line ending: {}", self.line_ending)?;
         writeln!(f, "Line width: {}", self.line_width.get())?;
-        writeln!(f, "Trailing comma: {}", self.trailing_comma)
+        writeln!(f, "Trailing comma: {}", self.trailing_commas)
     }
 }
diff --git a/crates/biome_json_formatter/tests/specs/json/array/empty_line.json.snap b/crates/biome_json_formatter/tests/specs/json/array/empty_line.json.snap
index a37ea63b5bcd..02037e57a8c1 100644
--- a/crates/biome_json_formatter/tests/specs/json/array/empty_line.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/array/empty_line.json.snap
@@ -28,6 +28,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/array/fill_layout.json.snap b/crates/biome_json_formatter/tests/specs/json/array/fill_layout.json.snap
index 7442a1e8b526..ec72b544cd7f 100644
--- a/crates/biome_json_formatter/tests/specs/json/array/fill_layout.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/array/fill_layout.json.snap
@@ -24,6 +24,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/array/layout.json.snap b/crates/biome_json_formatter/tests/specs/json/array/layout.json.snap
index 9db0223d7184..f0b973b321bf 100644
--- a/crates/biome_json_formatter/tests/specs/json/array/layout.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/array/layout.json.snap
@@ -32,6 +32,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/array/multi_line.json.snap b/crates/biome_json_formatter/tests/specs/json/array/multi_line.json.snap
index 60c8539466a1..c25fbb1f0430 100644
--- a/crates/biome_json_formatter/tests/specs/json/array/multi_line.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/array/multi_line.json.snap
@@ -28,6 +28,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/array/nested.json.snap b/crates/biome_json_formatter/tests/specs/json/array/nested.json.snap
index 0d21d2b59f83..6bbcb84cfa00 100644
--- a/crates/biome_json_formatter/tests/specs/json/array/nested.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/array/nested.json.snap
@@ -24,6 +24,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/array/one_per_line_layout.json.snap b/crates/biome_json_formatter/tests/specs/json/array/one_per_line_layout.json.snap
index eb972e2d261f..cea491766a99 100644
--- a/crates/biome_json_formatter/tests/specs/json/array/one_per_line_layout.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/array/one_per_line_layout.json.snap
@@ -32,6 +32,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/array/single_line.json.snap b/crates/biome_json_formatter/tests/specs/json/array/single_line.json.snap
index 519500c004b9..5b688c7c79bb 100644
--- a/crates/biome_json_formatter/tests/specs/json/array/single_line.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/array/single_line.json.snap
@@ -29,6 +29,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/comments/empty_with_comments.json.snap b/crates/biome_json_formatter/tests/specs/json/comments/empty_with_comments.json.snap
index 93e7be5385f6..811aa79b40f0 100644
--- a/crates/biome_json_formatter/tests/specs/json/comments/empty_with_comments.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/comments/empty_with_comments.json.snap
@@ -36,6 +36,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/comments/multiline.json.snap b/crates/biome_json_formatter/tests/specs/json/comments/multiline.json.snap
index 1820ce2f24ee..6e31cd9fcb4d 100644
--- a/crates/biome_json_formatter/tests/specs/json/comments/multiline.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/comments/multiline.json.snap
@@ -37,6 +37,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/empty.json.snap b/crates/biome_json_formatter/tests/specs/json/empty.json.snap
index 2242c449a75e..21fcb30913c6 100644
--- a/crates/biome_json_formatter/tests/specs/json/empty.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/empty.json.snap
@@ -21,6 +21,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/number.json.snap b/crates/biome_json_formatter/tests/specs/json/number.json.snap
index 5e86cd2bb084..e531f768b2f3 100644
--- a/crates/biome_json_formatter/tests/specs/json/number.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/number.json.snap
@@ -48,6 +48,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/object/complex.json.snap b/crates/biome_json_formatter/tests/specs/json/object/complex.json.snap
index ab5dba656b18..258a90e838f2 100644
--- a/crates/biome_json_formatter/tests/specs/json/object/complex.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/object/complex.json.snap
@@ -28,6 +28,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/object/missing_value.json.snap b/crates/biome_json_formatter/tests/specs/json/object/missing_value.json.snap
index 524d86c6977d..d5e733c6c50b 100644
--- a/crates/biome_json_formatter/tests/specs/json/object/missing_value.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/object/missing_value.json.snap
@@ -30,6 +30,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/object/multi_line.json.snap b/crates/biome_json_formatter/tests/specs/json/object/multi_line.json.snap
index 4fdf735e8dd7..37271bf054ee 100644
--- a/crates/biome_json_formatter/tests/specs/json/object/multi_line.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/object/multi_line.json.snap
@@ -25,6 +25,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/object/multi_line_long.json.snap b/crates/biome_json_formatter/tests/specs/json/object/multi_line_long.json.snap
index 6e8255ddb0d1..2089cd287b0d 100644
--- a/crates/biome_json_formatter/tests/specs/json/object/multi_line_long.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/object/multi_line_long.json.snap
@@ -25,6 +25,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/object/one_line.json.snap b/crates/biome_json_formatter/tests/specs/json/object/one_line.json.snap
index d6093e8efb49..cf54b1befa00 100644
--- a/crates/biome_json_formatter/tests/specs/json/object/one_line.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/object/one_line.json.snap
@@ -22,6 +22,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/object/one_line_long.json.snap b/crates/biome_json_formatter/tests/specs/json/object/one_line_long.json.snap
index 57b0dcdd4f7c..ddbcddd1ff74 100644
--- a/crates/biome_json_formatter/tests/specs/json/object/one_line_long.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/object/one_line_long.json.snap
@@ -22,6 +22,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/object/string.json.snap b/crates/biome_json_formatter/tests/specs/json/object/string.json.snap
index 23b51b82606a..16a75b0c3bb6 100644
--- a/crates/biome_json_formatter/tests/specs/json/object/string.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/object/string.json.snap
@@ -27,6 +27,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/smoke.json.snap b/crates/biome_json_formatter/tests/specs/json/smoke.json.snap
index 249ef1c9b39b..1f6b961e8165 100644
--- a/crates/biome_json_formatter/tests/specs/json/smoke.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/smoke.json.snap
@@ -28,6 +28,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/json/undefined/utf8_bom_empty_object.json.snap b/crates/biome_json_formatter/tests/specs/json/undefined/utf8_bom_empty_object.json.snap
index f01ed893e354..7963550e9018 100644
--- a/crates/biome_json_formatter/tests/specs/json/undefined/utf8_bom_empty_object.json.snap
+++ b/crates/biome_json_formatter/tests/specs/json/undefined/utf8_bom_empty_object.json.snap
@@ -21,6 +21,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Trailing comma: None
 -----
 
 ```json
diff --git a/crates/biome_json_formatter/tests/specs/prettier/json/json/array.json.snap b/crates/biome_json_formatter/tests/specs/prettier/json/json/array.json.snap
index d61050f93fae..bf9a5eaa575c 100644
--- a/crates/biome_json_formatter/tests/specs/prettier/json/json/array.json.snap
+++ b/crates/biome_json_formatter/tests/specs/prettier/json/json/array.json.snap
@@ -24,31 +24,15 @@ info: json/json/array.json
 ```diff
 --- Prettier
 +++ Biome
-@@ -1 +1,9 @@
+@@ -1 +1 @@
 -[[1, null], [1, null], [null], [0], [false], [""]]
-+[
-+  [
-+1,null],
-+  [1,null,],
-+  [null,],
-+  [0,],
-+  [false,],
-+  ['',]
-+]
++[[1, null], [1, null], [null], [0], [false], ['']]
 ```
 
 # Output
 
 ```json
-[
-  [
-1,null],
-  [1,null,],
-  [null,],
-  [0,],
-  [false,],
-  ['',]
-]
+[[1, null], [1, null], [null], [0], [false], ['']]
 ```
 
 # Errors
diff --git a/crates/biome_lsp/src/handlers/text_document.rs b/crates/biome_lsp/src/handlers/text_document.rs
index 706102a11697..8994f2f95eee 100644
--- a/crates/biome_lsp/src/handlers/text_document.rs
+++ b/crates/biome_lsp/src/handlers/text_document.rs
@@ -26,7 +26,7 @@ pub(crate) async fn did_open(
         path: biome_path,
         version,
         content,
-        document_file_source: language_hint,
+        document_file_source: Some(language_hint),
     })?;
 
     session.insert_document(url.clone(), doc);
diff --git a/crates/biome_service/src/configuration/json.rs b/crates/biome_service/src/configuration/json.rs
index f11f30067331..1fde1be596bb 100644
--- a/crates/biome_service/src/configuration/json.rs
+++ b/crates/biome_service/src/configuration/json.rs
@@ -1,7 +1,7 @@
 use crate::configuration::{deserialize_line_width, serialize_line_width, PlainIndentStyle};
 use biome_deserialize_macros::{Deserializable, Merge, Partial};
 use biome_formatter::{LineEnding, LineWidth};
-use biome_json_formatter::context::TrailingComma;
+use biome_json_formatter::context::TrailingCommas;
 use bpaf::Bpaf;
 use serde::{Deserialize, Serialize};
 
@@ -71,11 +71,11 @@ pub struct JsonFormatter {
 
     /// Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "omit".
     #[partial(bpaf(
-        long("json-formatter-trailing-comma"),
+        long("json-formatter-trailing-commas"),
         argument("omit|allow"),
         optional
     ))]
-    pub trailing_comma: Option<TrailingComma>,
+    pub trailing_commas: Option<TrailingCommas>,
 }
 
 impl PartialJsonFormatter {
@@ -87,7 +87,7 @@ impl PartialJsonFormatter {
             indent_size: self.indent_size,
             line_ending: self.line_ending,
             line_width: self.line_width,
-            trailing_comma: self.trailing_comma,
+            trailing_commas: self.trailing_commas,
         }
     }
 }
@@ -101,7 +101,7 @@ impl Default for JsonFormatter {
             indent_size: Default::default(),
             line_ending: Default::default(),
             line_width: Default::default(),
-            trailing_comma: Default::default(),
+            trailing_commas: Default::default(),
         }
     }
 }
diff --git a/crates/biome_service/src/file_handlers/json.rs b/crates/biome_service/src/file_handlers/json.rs
index ae57cf8d37f4..5c0376ec9977 100644
--- a/crates/biome_service/src/file_handlers/json.rs
+++ b/crates/biome_service/src/file_handlers/json.rs
@@ -21,7 +21,7 @@ use biome_diagnostics::{category, Diagnostic, DiagnosticExt, Severity};
 use biome_formatter::{FormatError, IndentStyle, IndentWidth, LineEnding, LineWidth, Printed};
 use biome_fs::{BiomePath, ConfigName, ROME_JSON};
 use biome_json_analyze::analyze;
-use biome_json_formatter::context::{JsonFormatOptions, TrailingComma};
+use biome_json_formatter::context::{JsonFormatOptions, TrailingCommas};
 use biome_json_formatter::format_node;
 use biome_json_parser::JsonParserOptions;
 use biome_json_syntax::{JsonLanguage, JsonRoot, JsonSyntaxNode};
@@ -37,7 +37,7 @@ pub struct JsonFormatterSettings {
     pub line_width: Option<LineWidth>,
     pub indent_width: Option<IndentWidth>,
     pub indent_style: Option<IndentStyle>,
-    pub trailing_comma: Option<TrailingComma>,
+    pub trailing_comma: Option<TrailingCommas>,
     pub enabled: Option<bool>,
 }
 
@@ -63,7 +63,7 @@ impl Language for JsonLanguage {
         overrides: &OverrideSettings,
         language: &JsonFormatterSettings,
         path: &BiomePath,
-        document_file_source: &DocumentFileSource,
+        _document_file_source: &DocumentFileSource,
     ) -> Self::FormatOptions {
         let indent_style = if let Some(indent_style) = language.indent_style {
             indent_style
@@ -94,21 +94,7 @@ impl Language for JsonLanguage {
                 .with_indent_style(indent_style)
                 .with_indent_width(indent_width)
                 .with_line_width(line_width)
-                .with_trailing_comma(
-                    language
-                        .trailing_comma
-                        .or(document_file_source
-                            .to_json_file_source()
-                            .map(|source| source.allows_trailing_comma())
-                            .map(|allows| {
-                                if allows {
-                                    TrailingComma::All
-                                } else {
-                                    TrailingComma::None
-                                }
-                            }))
-                        .unwrap_or_default(),
-                ),
+                .with_trailing_comma(language.trailing_comma.unwrap_or_default()),
         )
     }
 }
diff --git a/crates/biome_service/src/settings.rs b/crates/biome_service/src/settings.rs
index fd67dbd1941c..cb500ffbe0d4 100644
--- a/crates/biome_service/src/settings.rs
+++ b/crates/biome_service/src/settings.rs
@@ -342,7 +342,7 @@ impl From<JsonConfiguration> for LanguageSettings<JsonLanguage> {
 
         language_setting.parser.allow_comments = json.parser.allow_comments;
         language_setting.parser.allow_trailing_commas = json.parser.allow_trailing_commas;
-        language_setting.formatter.trailing_comma = json.formatter.trailing_comma;
+        language_setting.formatter.trailing_comma = json.formatter.trailing_commas;
         language_setting.formatter.enabled = Some(json.formatter.enabled);
         language_setting.formatter.line_width = json.formatter.line_width;
         language_setting.formatter.indent_width = json.formatter.indent_width.map(Into::into);
diff --git a/crates/biome_service/src/workspace.rs b/crates/biome_service/src/workspace.rs
index ef96c513cb13..7a30c7fde66e 100644
--- a/crates/biome_service/src/workspace.rs
+++ b/crates/biome_service/src/workspace.rs
@@ -415,8 +415,7 @@ pub struct OpenFileParams {
     pub path: BiomePath,
     pub content: String,
     pub version: i32,
-    #[serde(default)]
-    pub document_file_source: DocumentFileSource,
+    pub document_file_source: Option<DocumentFileSource>,
 }
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
diff --git a/crates/biome_service/src/workspace/server.rs b/crates/biome_service/src/workspace/server.rs
index 207c9628c603..b695abc6fc77 100644
--- a/crates/biome_service/src/workspace/server.rs
+++ b/crates/biome_service/src/workspace/server.rs
@@ -377,7 +377,11 @@ impl Workspace for WorkspaceServer {
     /// Add a new file to the workspace
     fn open_file(&self, params: OpenFileParams) -> Result<(), WorkspaceError> {
         let mut file_sources = self.file_sources.write().unwrap();
-        let (index, _) = file_sources.insert_full(params.document_file_source);
+        let (index, _) = file_sources.insert_full(
+            params
+                .document_file_source
+                .unwrap_or(DocumentFileSource::from_path(&params.path)),
+        );
         self.syntax.remove(&params.path);
         self.documents.insert(
             params.path,
diff --git a/packages/@biomejs/biome/configuration_schema.json b/packages/@biomejs/biome/configuration_schema.json
index 4da2f68adfac..2a36984567d8 100644
--- a/packages/@biomejs/biome/configuration_schema.json
+++ b/packages/@biomejs/biome/configuration_schema.json
@@ -1237,10 +1237,10 @@
 					"description": "What's the max width of a line applied to JSON (and its super languages) files. Defaults to 80.",
 					"anyOf": [{ "$ref": "#/definitions/LineWidth" }, { "type": "null" }]
 				},
-				"trailingComma": {
+				"trailingCommas": {
 					"description": "Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to \"omit\".",
 					"anyOf": [
-						{ "$ref": "#/definitions/TrailingComma" },
+						{ "$ref": "#/definitions/TrailingCommas" },
 						{ "type": "null" }
 					]
 				}
@@ -2625,6 +2625,20 @@
 				}
 			]
 		},
+		"TrailingCommas": {
+			"oneOf": [
+				{
+					"description": "The formatter will remove the trailing comma",
+					"type": "string",
+					"enum": ["none"]
+				},
+				{
+					"description": "The trailing comma is allowed and advised",
+					"type": "string",
+					"enum": ["all"]
+				}
+			]
+		},
 		"UtilityClassSortingConfiguration": {
 			"anyOf": [
 				{ "$ref": "#/definitions/RulePlainConfiguration" },
diff --git a/website/src/content/docs/internals/changelog.md b/website/src/content/docs/internals/changelog.md
index c2dc45ead5fe..774e7dc7b937 100644
--- a/website/src/content/docs/internals/changelog.md
+++ b/website/src/content/docs/internals/changelog.md
@@ -628,7 +628,6 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 #### New features
 
 - Add option `json.formatter.trailingComma`, to provide a better control over the trailing comma in JSON/JSONC files. Its default value is `"none"`.
-  When this option isn't provided, and you set the parser option `json.parser.allowTrailingComma` to `true`, the value of `json.formatter.trailingComma` is `"all"`.
 
 #### Bug fixes
 
diff --git a/website/src/content/docs/reference/configuration.mdx b/website/src/content/docs/reference/configuration.mdx
index 98e3cca22b3e..6b1739ac452d 100644
--- a/website/src/content/docs/reference/configuration.mdx
+++ b/website/src/content/docs/reference/configuration.mdx
@@ -47,7 +47,7 @@ this limit will be ignored for performance reasons.
 
 > Default: 1024*1024 (1MB)
 
- ### `files.ignore`
+### `files.ignore`
 
 A list of Unix shell style patterns. Biome ignores files and folders that
 match these patterns.
@@ -96,7 +96,7 @@ Given the following example:
 Only the files that match the pattern `src/**/*.js` will be handled, while the files that match the pattern
 `scripts/**/*.js` will be ignored.
 
- ### `files.ignoreUnknown`
+### `files.ignoreUnknown`
 
 Biome won't emit diagnostics if it encounters files that can't handle.
 
@@ -259,7 +259,7 @@ In the previous example, Biome will enable all rules, exception for rules that b
 
 Options that influence the rules of a single group. Biome supports the following groups:
 
-<LintGroups />
+<LintGroups/>
 
 ### `linter.rules.[group].recommended`
 
@@ -704,8 +704,6 @@ Allowed values:
 
 > Default: `none`
 
-When this option isn't provided, and you set the parser option `json.parser.allowTrailingComma` to `true`, the value of `json.formatter.trailingComma` is `"all"`.
-
 ## `overrides`
 
 A list of patterns.