diff --git a/src/services/player.ts b/src/services/player.ts
index b8330224..c560f942 100644
--- a/src/services/player.ts
+++ b/src/services/player.ts
@@ -633,7 +633,7 @@ export default class {
   private async onAudioPlayerIdle(_oldState: AudioPlayerState, newState: AudioPlayerState): Promise<void> {
     // Automatically advance queued song at end
     if (this.loopCurrentSong && newState.status === AudioPlayerStatus.Idle && this.status === STATUS.PLAYING) {
-      await this.seek(0);
+      await this.seek(0);      
       return;
     }
 
@@ -654,10 +654,16 @@ export default class {
       const settings = await getGuildSettings(this.guildId);
       const {autoAnnounceNextSong} = settings;
       if (autoAnnounceNextSong && this.currentChannel) {
-        await this.currentChannel.send({
-          embeds: this.getCurrent() ? [buildPlayingMessageEmbed(this)] : [],
-        });
-      }
+        if (this.getCurrent()) {
+          await this.currentChannel.send({
+            embeds: [buildPlayingMessageEmbed(this)]
+          });
+        } else {
+          await this.currentChannel.send({
+            content: "Queue is now empty, will leave in "
+          });
+        }
+      }      
     }
   }