diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 84fc2ca..d73d753 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -285,7 +285,8 @@
 void VNCSConnectionST::renderedCursorChange()
 {
   if (state() != RFBSTATE_NORMAL) return;
-  removeRenderedCursor = true;
+  if (!renderedCursorRect.is_empty())
+    removeRenderedCursor = true;
   if (needRenderedCursor())
     drawRenderedCursor = true;
 }
@@ -565,7 +566,8 @@
 void VNCSConnectionST::supportsLocalCursor()
 {
   if (cp.supportsLocalCursor || cp.supportsLocalXCursor) {
-    removeRenderedCursor = true;
+    if (!renderedCursorRect.is_empty())
+      removeRenderedCursor = true;
     drawRenderedCursor = false;
     setCursor();
   }