diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp
index 591b4cab1..748c8cb7c 100644
--- a/src/lib/client/Client.cpp
+++ b/src/lib/client/Client.cpp
@@ -672,6 +672,10 @@ Client::handleShapeChanged(const Event&, void*)
 void
 Client::handleClipboardGrabbed(const Event& event, void*)
 {
+	if (!m_enableClipboard) {
+		return;
+	}
+
 	const IScreen::ClipboardInfo* info =
 		reinterpret_cast<const IScreen::ClipboardInfo*>(event.getData());
 
diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp
index af9588892..b0ff56fc6 100644
--- a/src/lib/server/Server.cpp
+++ b/src/lib/server/Server.cpp
@@ -1219,6 +1219,10 @@ Server::handleShapeChanged(const Event&, void* vclient)
 void
 Server::handleClipboardGrabbed(const Event& event, void* vclient)
 {
+	if (!m_enableClipboard) {
+		return;
+	}
+
 	// ignore events from unknown clients
 	BaseClientProxy* grabber = reinterpret_cast<BaseClientProxy*>(vclient);
 	if (m_clientSet.count(grabber) == 0) {