diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp
index 9224db6a..4fbf76af 100644
--- a/src/lib/client/ServerProxy.cpp
+++ b/src/lib/client/ServerProxy.cpp
@@ -81,6 +81,7 @@ ServerProxy::~ServerProxy()
     setKeepAliveRate(-1.0);
     m_events->removeHandler(m_events->forIStream().inputReady(),
                             m_stream->getEventTarget());
+    m_events->removeHandler(m_events->forClipboard().clipboardSending(), this);
 }
 
 void