diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js
index 2d2fdce0a..4e4831c36 100644
--- a/guacamole-common-js/src/main/resources/guacamole.js
+++ b/guacamole-common-js/src/main/resources/guacamole.js
@@ -333,17 +333,22 @@ function GuacamoleClient(display, tunnel) {
 
             }
 
-            // Count active layers and install sync tracking hook
+            // Count active, not-ready layers and install sync tracking hooks
             for (var i=0; i<layers.length; i++) {
 
                 var layer = layers[i];
-                if (layer) {
+                if (layer && !layer.isReady()) {
                     layersToSync++;
                     layer.sync(syncLayer);
                 }
 
             }
 
+            // If all layers are ready, then we didn't install any hooks.
+            // Send sync message now,
+            if (layersToSync == 0)
+                tunnel.sendMessage("sync:" + timestamp + ";");
+
         },
       
     };