diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js
index 7ffbefe7f..6076a5f3b 100644
--- a/guacamole-common-js/src/main/resources/guacamole.js
+++ b/guacamole-common-js/src/main/resources/guacamole.js
@@ -832,10 +832,6 @@ Guacamole.Client = function(tunnel) {
                 "data:image/png;base64," + data
             );
 
-            // If received first update, no longer waiting.
-            if (currentState == STATE_WAITING)
-                setState(STATE_CONNECTED);
-
         },
 
         "pop": function(parameters) {
@@ -996,6 +992,10 @@ Guacamole.Client = function(tunnel) {
                 }
             }
 
+            // If received first update, no longer waiting.
+            if (currentState == STATE_WAITING)
+                setState(STATE_CONNECTED);
+
         },
 
         "transfer": function(parameters) {