diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 9124f24d61..b7e8b45945 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -182,6 +182,8 @@ namespace Avalonia.Rendering
 
             if (scene.Size != Size.Empty)
             {
+                RenderOverlay(scene);
+
                 if (scene.Generation != _lastSceneId)
                 {
                     _layers.Update(scene);
@@ -193,10 +195,9 @@ namespace Avalonia.Rendering
                     }
 
                     _lastSceneId = scene.Generation;
-                }
 
-                RenderOverlay(scene);
-                RenderComposite(scene);
+                    RenderComposite(scene);
+                }
             }
         }