diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index 7672bcb14d..5e76ee56cf 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -128,7 +128,9 @@ namespace Avalonia.Rendering.Composition.Server
 
             if (_renderTarget?.IsCorrupted == true)
             {
-                _renderTarget!.Dispose();
+                _layer?.Dispose();
+                _layer = null;
+                _renderTarget.Dispose();
                 _renderTarget = null;
                 _redrawRequested = true;
             }