diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea716b39f..144356e97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # 2.103.x
+* Fix indentation after pressing Enter in Razor files (PR: [#8809](https://github.com/dotnet/vscode-csharp/pull/8809))
 
 # 2.102.x
 * Update Roslyn to 5.3.0-2.25568.9 (PR: [#8799](https://github.com/dotnet/vscode-csharp/pull/8799))
diff --git a/src/lsptoolshost/razor/razorEndpoints.ts b/src/lsptoolshost/razor/razorEndpoints.ts
index ecd5a7664..7fca9bae9 100644
--- a/src/lsptoolshost/razor/razorEndpoints.ts
+++ b/src/lsptoolshost/razor/razorEndpoints.ts
@@ -54,6 +54,7 @@ import { HtmlDocument } from './htmlDocument';
 import { HtmlForwardedRequest } from './htmlForwardedRequest';
 import { BlazorDebugConfigurationProvider } from '../../razor/src/blazorDebug/blazorDebugConfigurationProvider';
 import { ShowGeneratedDocumentCommand } from './showGeneratedDocumentCommand';
+import { RazorLanguageConfiguration } from '../../razor/src/razorLanguageConfiguration';
 
 export function registerRazorEndpoints(
     context: vscode.ExtensionContext,
@@ -72,6 +73,9 @@ export function registerRazorEndpoints(
 
         context.subscriptions.push(BlazorDebugConfigurationProvider.register(razorLogger, vscode));
         context.subscriptions.push(ShowGeneratedDocumentCommand.register(roslynLanguageServer));
+
+        const languageConfiguration = new RazorLanguageConfiguration();
+        context.subscriptions.push(languageConfiguration.register());
     } else {
         vscode.commands.executeCommand('setContext', 'razor.mode', 'lsp');
         registerNonCohostingEndpoints();