diff --git a/src/Components/Server/src/Circuits/CircuitIdFactory.cs b/src/Components/Server/src/Circuits/CircuitIdFactory.cs
index 7250ee8116..61ded8c441 100644
--- a/src/Components/Server/src/Circuits/CircuitIdFactory.cs
+++ b/src/Components/Server/src/Circuits/CircuitIdFactory.cs
@@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
return new CircuitId(Base64UrlTextEncoder.Encode(secret), Base64UrlTextEncoder.Encode(id));
}
- public bool TryParseCircuitId(string text, out CircuitId circuitId)
+ public bool TryParseCircuitId(string? text, out CircuitId circuitId)
{
if (text is null)
{
diff --git a/src/Components/Server/src/Circuits/RemoteRenderer.cs b/src/Components/Server/src/Circuits/RemoteRenderer.cs
index 0d9f862da2..59f93f6526 100644
--- a/src/Components/Server/src/Circuits/RemoteRenderer.cs
+++ b/src/Components/Server/src/Circuits/RemoteRenderer.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
///
/// Notifies when a rendering exception occurred.
///
- public event EventHandler UnhandledException;
+ public event EventHandler? UnhandledException;
///
/// Creates a new .
@@ -171,7 +171,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
pendingRender = new UnacknowledgedRenderBatch(
renderId,
arrayBuilder,
- new TaskCompletionSource