diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 12cfab8..e286cf3 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -171,10 +171,12 @@
       cp.height = server->pb->height();
       cp.screenLayout = server->screenLayout;
       if (state() == RFBSTATE_NORMAL) {
-        if (!writer()->writeSetDesktopSize() &&
-            !writer()->writeExtendedDesktopSize()) {
-          close("Client does not support desktop resize");
-          return;
+        // We should only send EDS to client asking for both
+        if (!writer()->writeExtendedDesktopSize()) {
+          if (!writer()->writeSetDesktopSize()) {
+            close("Client does not support desktop resize");
+            return;
+          }
         }
       }
     }