diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 01cb974bc1242..b9291c6a2e027 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -4641,10 +4641,6 @@
         "category": "Error",
         "code": 5110
     },
-    "Option 'tsBuildInfoFile' cannot be specified without specifying option 'incremental' or 'composite' or if not running 'tsc -b'.": {
-        "category": "Error",
-        "code": 5111
-    },
 
     "Generates a sourcemap for each corresponding '.d.ts' file.": {
         "category": "Message",
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f79fdf2136407..771b1bee0adfd 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -499,8 +499,7 @@ export function getTsBuildInfoEmitOutputFilePath(options: CompilerOptions) {
     return buildInfoExtensionLess + Extension.TsBuildInfo;
 }
 
-/** @internal */
-export function canEmitTsBuildInfo(options: CompilerOptions) {
+function canEmitTsBuildInfo(options: CompilerOptions) {
     return isIncrementalCompilation(options) || !!options.tscBuild;
 }
 
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 06bb19f84d158..981e73503bde4 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -8,7 +8,6 @@ import {
     AsExpression,
     BuilderProgram,
     CancellationToken,
-    canEmitTsBuildInfo,
     canHaveDecorators,
     canHaveIllegalDecorators,
     chainDiagnosticMessages,
@@ -4302,12 +4301,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         }
 
         const outputFile = options.outFile;
-        if (options.tsBuildInfoFile) {
-            if (!canEmitTsBuildInfo(options)) {
-                createDiagnosticForOptionName(Diagnostics.Option_tsBuildInfoFile_cannot_be_specified_without_specifying_option_incremental_or_composite_or_if_not_running_tsc_b, "tsBuildInfoFile");
-            }
-        }
-        else if (options.incremental && !outputFile && !options.configFilePath) {
+        if (!options.tsBuildInfoFile && options.incremental && !outputFile && !options.configFilePath) {
             programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified));
         }
 
diff --git a/tests/baselines/reference/optionsTsBuildInfoFileWithoutIncrementalAndComposite.errors.txt b/tests/baselines/reference/optionsTsBuildInfoFileWithoutIncrementalAndComposite.errors.txt
deleted file mode 100644
index b9e64cd960dc8..0000000000000
--- a/tests/baselines/reference/optionsTsBuildInfoFileWithoutIncrementalAndComposite.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-error TS5111: Option 'tsBuildInfoFile' cannot be specified without specifying option 'incremental' or 'composite' or if not running 'tsc -b'.
-
-
-!!! error TS5111: Option 'tsBuildInfoFile' cannot be specified without specifying option 'incremental' or 'composite' or if not running 'tsc -b'.
-==== optionsTsBuildInfoFileWithoutIncrementalAndComposite.ts (0 errors) ====
-    const x = "Hello World";
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsc/composite/when-setting-composite-false-on-command-line-but-has-tsbuild-info-in-config.js b/tests/baselines/reference/tsc/composite/when-setting-composite-false-on-command-line-but-has-tsbuild-info-in-config.js
index fdc3a6e6d6146..025b8a904bb24 100644
--- a/tests/baselines/reference/tsc/composite/when-setting-composite-false-on-command-line-but-has-tsbuild-info-in-config.js
+++ b/tests/baselines/reference/tsc/composite/when-setting-composite-false-on-command-line-but-has-tsbuild-info-in-config.js
@@ -35,15 +35,7 @@ export const x = 10;
 
 Output::
 /lib/tsc --composite false --p src/project
-src/project/tsconfig.json:6:9 - error TS5111: Option 'tsBuildInfoFile' cannot be specified without specifying option 'incremental' or 'composite' or if not running 'tsc -b'.
-
-6         "tsBuildInfoFile": "tsconfig.json.tsbuildinfo"
-          ~~~~~~~~~~~~~~~~~
-
-
-Found 1 error in src/project/tsconfig.json:6
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 
 //// [/src/project/src/main.js]