diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.java
index de551f356c..f23dd05680 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -223,7 +223,7 @@ public boolean setClipboardText(String text) {
         }
 
         String currentClipboard = getClipboardText();
-        if (currentClipboard == null || currentClipboard.equals(text)) {
+        if (currentClipboard != null && currentClipboard.equals(text)) {
             // The clipboard already contains the requested text.
             // Since pasting text from the computer involves setting the device clipboard, it could be set twice on a copy-paste. This would cause
             // the clipboard listeners to be notified twice, and that would flood the Android keyboard clipboard history. To workaround this