diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 78092e12c6..a4929c7c91 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -25,7 +25,6 @@ public:
     ComPtr<IAvnGlContext> _glContext;
     NSObject<IRenderTarget>* renderTarget;
     AvnPoint lastPositionSet;
-    CGSize _lastRequestedSize;
     NSString* _lastTitle;
     IAvnMenu* _mainMenu;
     
@@ -201,11 +200,7 @@ public:
                 ret->Width = frame.size.width;
                 ret->Height = frame.size.height;
             }
-            else
-            {
-                ret->Width = _lastRequestedSize.width;
-                ret->Height = _lastRequestedSize.height;
-            }
+            
             return S_OK;
         }
     }
@@ -266,8 +261,10 @@ public:
                 y = maxSize.height;
             }
             
-            _lastRequestedSize.width = x;
-            _lastRequestedSize.height = y;
+            if(!_shown)
+            {
+                BaseEvents->Resized(AvnSize{x,y});
+            }
             
             [Window setContentSize:NSSize{x, y}];
             
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index ab6e16d8dd..d2226503d2 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -656,7 +656,6 @@ namespace Avalonia.Controls
                     if (PlatformImpl != null)
                     {
                         PlatformImpl.Resize(initialSize);
-                        ClientSize = PlatformImpl.ClientSize;
                     }
                 }
             }