diff --git a/changes/changelog.d/fix-favorite-button-in-queue.bugfix b/changes/changelog.d/fix-favorite-button-in-queue.bugfix
new file mode 100644
index 000000000..6992213a3
--- /dev/null
+++ b/changes/changelog.d/fix-favorite-button-in-queue.bugfix
@@ -0,0 +1 @@
+Fix favorite button in queue
diff --git a/front/src/components/Queue.vue b/front/src/components/Queue.vue
index fa872dcab..1bf3e6429 100644
--- a/front/src/components/Queue.vue
+++ b/front/src/components/Queue.vue
@@ -118,7 +118,7 @@ const play = async (index: number) => {
 
 const queueItems = computed(() => queue.value.map((track, index) => ({
   ...track,
-  id: `${index}-${track.id}`,
+  key: `${index}-${track.id}`,
   labels: {
     remove: $pgettext('*/*/*', 'Remove'),
     selectTrack: $pgettext('*/*/*', 'Select track'),
@@ -362,6 +362,7 @@ const hideArtist = () => {
               :index="index"
               :source="item"
               :class="[...classList, currentIndex === index && 'active']"
+              key-field="key"
               @play="play"
               @remove="dequeue"
             />
diff --git a/front/src/components/QueueItem.vue b/front/src/components/QueueItem.vue
index 49b8c3c4c..1f26f7fb9 100644
--- a/front/src/components/QueueItem.vue
+++ b/front/src/components/QueueItem.vue
@@ -54,6 +54,7 @@ defineProps<Props>()
     </div>
     <div class="controls">
       <button
+        v-if="$store.state.auth.authenticated"
         :aria-label="source.labels.favorite"
         :title="source.labels.favorite"
         class="ui really basic circular icon button"
diff --git a/front/src/types.ts b/front/src/types.ts
index 98afa8a50..d9f395b0c 100644
--- a/front/src/types.ts
+++ b/front/src/types.ts
@@ -19,8 +19,8 @@ export interface InitModuleContext {
 
 export type InitModule = (ctx: InitModuleContext) => void | Promise<void>
 
-export interface QueueItemSource extends Omit<QueueTrack, 'id'> {
-  id: string
+export interface QueueItemSource extends QueueTrack {
+  key: string
 
   labels: {
     remove: string