diff --git a/common/rfb/SMsgWriter.cxx b/common/rfb/SMsgWriter.cxx
index ee1033f5b..260e44d38 100644
--- a/common/rfb/SMsgWriter.cxx
+++ b/common/rfb/SMsgWriter.cxx
@@ -284,8 +284,6 @@ bool SMsgWriter::needNoDataUpdate()
     return true;
   if (needExtendedDesktopSize || !extendedDesktopSizeMsgs.empty())
     return true;
-  if (needSetCursor || needSetXCursor || needSetCursorWithAlpha || needSetVMWareCursor)
-      return true;
 
   return false;
 }
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 27f2fba22..35e899ff4 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -1414,7 +1414,7 @@ void VNCSConnectionST::writeFramebufferUpdate()
 
 void VNCSConnectionST::writeNoDataUpdate()
 {
-  if (!writer()->needNoDataUpdate())
+  if (!writer()->needFakeUpdate())
     return;
 
   writer()->writeNoDataUpdate();