diff --git a/client/src/common/client.ts b/client/src/common/client.ts
index dcbe4ab3b..e0f52f6ee 100644
--- a/client/src/common/client.ts
+++ b/client/src/common/client.ts
@@ -1073,9 +1073,7 @@ export abstract class BaseLanguageClient implements FeatureClient<Middleware, La
 
 		// If we restart then the diagnostics collection is reused.
 		if (this._diagnostics === undefined) {
-			this._diagnostics = this._clientOptions.diagnosticCollectionName
-				? Languages.createDiagnosticCollection(this._clientOptions.diagnosticCollectionName)
-				: Languages.createDiagnosticCollection();
+			this._diagnostics = Languages.createDiagnosticCollection(this._clientOptions.diagnosticCollectionName ?? this._id);
 		}
 
 		// When we start make all buffer handlers pending so that they