diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index c3912077ee..eecf0d9101 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -532,7 +532,7 @@ namespace Avalonia.Controls.Presenters
                 return finalSize;
             }
 
-            var textSize = PixelSize.FromSize(finalSize, 1);
+            var textSize = PixelSize.FromSize(finalSize, VisualRoot?.RenderScaling ?? 1);
 
             _constraint = new Size(textSize.Width, textSize.Height);
 
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index 7427f21134..1087310841 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -626,7 +626,7 @@ namespace Avalonia.Controls
 
             var padding = Padding;
 
-            var textSize = PixelSize.FromSize(finalSize.Deflate(padding), 1);
+            var textSize = PixelSize.FromSize(finalSize.Deflate(padding), VisualRoot?.RenderScaling ?? 1);
 
             _constraint = new Size(textSize.Width, textSize.Height);