diff --git a/src/Avalonia.SceneGraph/Media/DrawingContext.cs b/src/Avalonia.SceneGraph/Media/DrawingContext.cs
index 43ee65de16..ddaa681bab 100644
--- a/src/Avalonia.SceneGraph/Media/DrawingContext.cs
+++ b/src/Avalonia.SceneGraph/Media/DrawingContext.cs
@@ -68,10 +68,8 @@ namespace Avalonia.Media
 
         //HACK: This is a temporary hack that is used in the render loop 
         //to update TransformedBounds property
-        #pragma warning disable 0618
         [Obsolete("HACK for render loop, don't use")]
-        internal Matrix CurrentContainerTransform => _currentContainerTransform;
-        #pragma warning restore 0618
+        internal Matrix CurrentContainerTransform => _currentContainerTransform;        
 
         /// <summary>
         /// Draws a bitmap image.
diff --git a/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs b/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs
index 416cdb9855..f5dc3c4566 100644
--- a/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs
+++ b/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs
@@ -124,8 +124,12 @@ namespace Avalonia.Rendering
                 using (context.PushTransformContainer())
                 {
                     visual.Render(context);
+
+#pragma warning disable 0618
                     var transformed =
                         new TransformedBounds(bounds, new Rect(), context.CurrentContainerTransform);
+#pragma warning restore 0618
+
                     if (visual is Visual)
                     {
                         BoundsTracker.SetTransformedBounds((Visual)visual, transformed);