diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index fb6d43229e..e29c877cf5 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -756,6 +756,9 @@ void Viewport::handleClipboardChange(int source, void *data)
 
   if (!Fl::clipboard_contains(Fl::clipboard_plain_text)) {
     vlog.debug("Got non-plain text in local clipboard, ignoring.");
+    // Reset the state as if we don't have any clipboard data at all
+    self->pendingClientClipboard = false;
+    self->cc->announceClipboard(false);
     return;
   }