diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9769a6f7..59b0cd618 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 ### Fixed
 
+- `WrapperBase.WrappedElement` could return `null` and throw `NullReferenceException` when an element was accessed concurrently with component re-renders. Reported by [@psu-prog](https://github.com/psu-prog) in #1937. Fixed by [@Nacl-HCl](https://github.com/Nacl-HCl).
 - `DisposeComponentsAsync()` could dispose nothing when the renderer's dispatcher was busy, e.g. with a timer calling `InvokeAsync`. Reported by [@xfunc-tim-schneider](https://github.com/xfunc-tim-schneider) in #1939. Fixed by [@linkdotnet](https://github.com/linkdotnet).
 
 ## [2.11.3] - 2026-09-13
diff --git a/src/bunit.generators.internal/Web.AngleSharp/WrapperBase.cs b/src/bunit.generators.internal/Web.AngleSharp/WrapperBase.cs
index 8dd4d5963..46bcc12f2 100644
--- a/src/bunit.generators.internal/Web.AngleSharp/WrapperBase.cs
+++ b/src/bunit.generators.internal/Web.AngleSharp/WrapperBase.cs
@@ -24,13 +24,7 @@ public abstract class WrapperBase<TElement> : IElementWrapper<TElement>
 	public TElement WrappedElement
 	{
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		get
-		{
-			if (element is null)
-				element = elementFactory.GetElement<TElement>();
-
-			return element;
-		}
+		get => element ??= elementFactory.GetElement<TElement>();
 	}
 
 	/// <summary>
diff --git a/tests/bunit.generators.tests/Web.AngleSharp/WrapperElementsGeneratorTest.Generator#WrapperBase.g.verified.cs b/tests/bunit.generators.tests/Web.AngleSharp/WrapperElementsGeneratorTest.Generator#WrapperBase.g.verified.cs
index 2f8cc5e05..6135001c7 100644
--- a/tests/bunit.generators.tests/Web.AngleSharp/WrapperElementsGeneratorTest.Generator#WrapperBase.g.verified.cs
+++ b/tests/bunit.generators.tests/Web.AngleSharp/WrapperElementsGeneratorTest.Generator#WrapperBase.g.verified.cs
@@ -1,4 +1,4 @@
-//HintName: WrapperBase.g.cs
+//HintName: WrapperBase.g.cs
 #nullable enable
 using System.CodeDom.Compiler;
 using System.Diagnostics;
@@ -25,13 +25,7 @@ public abstract class WrapperBase<TElement> : IElementWrapper<TElement>
 	public TElement WrappedElement
 	{
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		get
-		{
-			if (element is null)
-				element = elementFactory.GetElement<TElement>();
-
-			return element;
-		}
+		get => element ??= elementFactory.GetElement<TElement>();
 	}
 
 	/// <summary>
diff --git a/tests/bunit.tests/Extensions/RefreshingWrappedElementTest.cs b/tests/bunit.tests/Extensions/RefreshingWrappedElementTest.cs
index 4f1602435..e432b470b 100644
--- a/tests/bunit.tests/Extensions/RefreshingWrappedElementTest.cs
+++ b/tests/bunit.tests/Extensions/RefreshingWrappedElementTest.cs
@@ -76,6 +76,53 @@ public void Test031()
 		Should.Throw<ElementRemovedFromDomException>(() => btn.TextContent);
 	}
 
+	[Fact(DisplayName = "Found element is never null when accessed concurrently with component re-renders")]
+	public async Task Test040()
+	{
+		var cut = Render<Counter>();
+		var elm = cut.Find("span");
+		using var cts = CancellationTokenSource.CreateLinkedTokenSource(Xunit.TestContext.Current.CancellationToken);
+		cts.CancelAfter(TimeSpan.FromSeconds(1));
+		var renders = Task.Run(async () =>
+		{
+			while (!cts.IsCancellationRequested)
+			{
+				await cut.InvokeAsync(cut.Instance.Increment);
+			}
+		}, Xunit.TestContext.Current.CancellationToken);
+
+		try
+		{
+			while (!cts.IsCancellationRequested)
+			{
+				elm.TextContent.ShouldNotBeNull();
+			}
+		}
+		finally
+		{
+			await cts.CancelAsync();
+			await renders;
+		}
+	}
+
+	private sealed class Counter : ComponentBase
+	{
+		private int count;
+
+		public void Increment()
+		{
+			count++;
+			StateHasChanged();
+		}
+
+		protected override void BuildRenderTree(RenderTreeBuilder builder)
+		{
+			builder.OpenElement(0, "span");
+			builder.AddContent(1, count);
+			builder.CloseElement();
+		}
+	}
+
 	private sealed class Markup : ComponentBase
 	{
 		[Parameter] public string Base { get; set; } = string.Empty;