diff --git a/docker-compose.yml b/docker-compose.yml
index 385433d..dd41232 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,7 @@ services:
   app:
     build: .
     container_name: disco-bot
+    restart: always
     volumes:
       - ./data:/app/data
     env_file:
diff --git a/src/messages.ts b/src/messages.ts
index 8c9bc5b..c0766e7 100644
--- a/src/messages.ts
+++ b/src/messages.ts
@@ -11,7 +11,7 @@ export function getCurrentSongMsg(): string {
 }
 export function getQueueMsg(): string {
     const queue = getQueue()
-    return `Current: ${queue.current}
+    return `Current: ${queue.current?.replace("/app/data/", "").replace(/\[.*\].opus/,"").trim()}
 Queue:
-    ${queue.songList.join('\n    ')}`
+    ${queue.songList.join('\n    ').replace(/\/app\/data\//g, "").replace(/\[.*\].opus/g,"").trim()}`
 }