diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 98692b7483..a32b3327c2 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -975,7 +975,7 @@ namespace Avalonia.Skia
                 DisableTextLcdRendering = !_canTextUseLcdRendering,
                 GrContext = _grContext,
                 Gpu = _gpu,
-                SurfaceOrigin = _session?.SurfaceOrigin ?? GRSurfaceOrigin.TopLeft
+                Session = _session
             };
 
             return new SurfaceRenderTarget(createInfo);
diff --git a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
index 7442f90ecf..aa86df7c23 100644
--- a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
@@ -21,7 +21,7 @@ namespace Avalonia.Skia
         /// Creates an offscreen render target surface
         /// </summary>
         /// <param name="size">size in pixels</param>
-        ISkiaSurface TryCreateSurface(PixelSize size, GRSurfaceOrigin surfaceOrigin);
+        ISkiaSurface TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session);
     }
     
     public interface ISkiaSurface : IDisposable
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
index 02e3766d40..a393f0b64d 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Skia
             return null;
         }
 
-        public ISkiaSurface TryCreateSurface(PixelSize size, GRSurfaceOrigin surfaceOrigin)
+        public ISkiaSurface TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session)
         {
             // Only windows platform needs our FBO trickery
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -62,7 +62,7 @@ namespace Avalonia.Skia
                 return null;
             try
             {
-                var surface = new FboSkiaSurface(_grContext, _glContext, size, surfaceOrigin);
+                var surface = new FboSkiaSurface(_grContext, _glContext, size, session?.SurfaceOrigin ?? GRSurfaceOrigin.TopLeft);
                 _canCreateSurfaces = true;
                 return surface;
             }
diff --git a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
index d3d4515689..6347c64aed 100644
--- a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
@@ -51,7 +51,7 @@ namespace Avalonia.Skia
             _grContext = createInfo.GrContext;
             _gpu = createInfo.Gpu;
 
-            _surface = _gpu?.TryCreateSurface(PixelSize, createInfo.SurfaceOrigin);
+            _surface = _gpu?.TryCreateSurface(PixelSize, createInfo.Session);
             if (_surface == null)
                 _surface = new SkiaSurfaceWrapper(CreateSurface(createInfo.GrContext, PixelSize.Width, PixelSize.Height,
                     createInfo.Format));
@@ -219,7 +219,7 @@ namespace Avalonia.Skia
 
             public ISkiaGpu Gpu;
 
-            public GRSurfaceOrigin SurfaceOrigin;
+            public ISkiaGpuRenderSession Session;
         }
     }
 }