diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index 61924f53ab..7733bcd4ff 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -64,6 +64,12 @@ namespace Avalonia.DesignerSupport.Remote
         
         public void Resize(Size clientSize, WindowResizeReason reason)
         {
+            // Don't let it clientSize be unconstrained or risk running Out Of Memory 
+            clientSize = new Size(
+                Math.Min(clientSize.Width, MaxAutoSizeHint.Width),
+                Math.Min(clientSize.Height, MaxAutoSizeHint.Height)
+            );
+
             _transport.Send(new RequestViewportResizeMessage
             {
                 Width = Math.Ceiling(clientSize.Width * RenderScaling),