diff --git a/lib/server/CServer.cpp b/lib/server/CServer.cpp
index f3314c95..f4bc9868 100644
--- a/lib/server/CServer.cpp
+++ b/lib/server/CServer.cpp
@@ -1558,7 +1558,7 @@ CServer::onKeyDown(KeyID id, KeyModifierMask mask, KeyButton button,
 	assert(m_active != NULL);
 
 	// relay
-	if (!m_keyboardBroadcasting ||
+	if (!m_keyboardBroadcasting &&
 			(screens && IKeyState::CKeyInfo::isDefault(screens))) {
 		m_active->keyDown(id, mask, button);
 	}
@@ -1586,7 +1586,7 @@ CServer::onKeyUp(KeyID id, KeyModifierMask mask, KeyButton button,
 	assert(m_active != NULL);
 
 	// relay
-	if (!m_keyboardBroadcasting ||
+	if (!m_keyboardBroadcasting &&
 			(screens && IKeyState::CKeyInfo::isDefault(screens))) {
 		m_active->keyUp(id, mask, button);
 	}