diff --git a/ChangeLog b/ChangeLog
index f1318c2b4..23d4e3709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@ Bug fixes:
 - #7036 Fix tray icon not changing theme on Big Sur
 - #7046 Fix MacOS 10.13 build
 - #7049 Scroll doesn't work in case of macOS is server
-- #7057 Fix copy paste logic, when OS reported about clipboard update too late
+- #7057 | #7058 Fix copy paste logic, when OS reported about clipboard update too late
 - #7055 Add secure input notification on Linux
 - #7052 Add secure input notification on Windows
 - #7047 Fix prevent sleep option on Mac and Windows
diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp
index 7ed4bfd80..aebb82496 100644
--- a/src/lib/server/Server.cpp
+++ b/src/lib/server/Server.cpp
@@ -1303,7 +1303,7 @@ Server::handleClipboardGrabbed(const Event& event, void* vclient)
 		}
 	}
 
-    if (m_active != m_primaryClient) {
+    if (grabber == m_primaryClient && m_active != m_primaryClient) {
         LOG((CLOG_INFO "clipboard grabbed, but we are already changed active screen. Resend clipboard data"));
         for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
             onClipboardChanged(m_primaryClient, id, m_clipboards[id].m_clipboardSeqNum);