diff --git a/src/App.vue b/src/App.vue
index 7a17dec..1039e1a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -275,7 +275,7 @@ function joinRoom() {
       />
     <AlreadyQueued
       @append="raw_append(state.current_entry.ident, state.name ? state.name : state.current_name, state.current_entry.source, state.uid)"
-      @wait="(uid) => wait_append(state.current_entry.ident, state.name ? state.name : state.current_name, state.current_entry.source, uid)"
+      @wait="(uid) => wait_append(state.current_entry.ident, state.name ? state.name : state.current_name, state.current_entry.source, null)"
       @cancel="close_already_queued"
       :double_entry="state.double_entry"
       />
diff --git a/src/components/AlreadyQueued.vue b/src/components/AlreadyQueued.vue
index 073f4fe..b28eab2 100644
--- a/src/components/AlreadyQueued.vue
+++ b/src/components/AlreadyQueued.vue
@@ -5,15 +5,16 @@ const props = defineProps(["double_entry"]);
 <template>
 <div class="reveal" id="alreadyqueued" data-reveal >
 <h1>You are already in queue</h1>
+<p>
+<b>{{double_entry.artist}} - {{double_entry.title}}</b> <i>({{double_entry.performer}})</i>
+</p>
 <p>You can
 <ul>
 <li>append the song anyway, or</li>
 <li>add it to the <i>waiting room</i>.</li>
 </ul>
 </p>
-<p>Your song in the waiting room will be added to the queue, once 
-<b>{{double_entry.artist}} - {{double_entry.title}}</b> <i>({{double_entry.performer}})</i>
-leaves the queue.</p>
+<p>Songs in the waiting room will be added to the queue, once the last song of the performer leaves the queue.</p>
 <div class="grid-x">
   <div class="cell medium-6 small-12 btn">
     <button class="button expanded" @click="$emit('wait', double_entry.reason == 'uid' ? double_entry.uid : null)">Waiting room</button>