diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ClipboardState.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ClipboardState.java
index f5892c568..b656e7de5 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ClipboardState.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ClipboardState.java
@@ -45,7 +45,7 @@ public class ClipboardState {
      * Returns the current clipboard contents.
      * @return The current clipboard contents
      */
-    public String getContents() {
+    public synchronized String getContents() {
         return contents;
     }