diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 777242f9..fd470401 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -649,6 +649,13 @@ Callbacks = {
     },
 
     queue: function(data) {
+        // Wait until pending movements are completed
+        if(MOVING) {
+            setTimeout(function() {
+                Callbacks.queue(data);
+            }, 100);
+            return;
+        }
         var li = makeQueueEntry(data.media, true);
         li.hide();
         var idx = data.pos;