diff --git a/git-teaspeak b/git-teaspeak
index f7d60a9..15e5431 160000
--- a/git-teaspeak
+++ b/git-teaspeak
@@ -1 +1 @@
-Subproject commit f7d60a93a2c2c5a1e4cd87717d89f014a74e97ef
+Subproject commit 15e54314da1903c0a70845180898e41b75749dbd
diff --git a/server/src/client/command_handler/music.cpp b/server/src/client/command_handler/music.cpp
index d2f620b..58a2c33 100644
--- a/server/src/client/command_handler/music.cpp
+++ b/server/src/client/command_handler/music.cpp
@@ -875,8 +875,11 @@ command_result ConnectedClient::handleCommandPlaylistSongList(ts::Command &cmd)
     }
     if(index > 0)
         this->sendCommand(result);
-    if(this->getExternalType() == ClientType::CLIENT_TEAMSPEAK)
-        this->sendCommand(ts::command_builder{"notifyplaylistsonglistfinished"});
+    if(this->getExternalType() == ClientType::CLIENT_TEAMSPEAK) {
+        ts::command_builder finish{"notifyplaylistsonglistfinished"};
+        finish.put(0, "playlist_id", playlist->playlist_id());
+        this->sendCommand(finish);
+    }
 
     return command_result{error::ok};
 }
diff --git a/shared b/shared
index e1e946c..9063e17 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit e1e946ca359f65fff5e19583ff1c9711a3143460
+Subproject commit 9063e17efb1b1d837e771da6c8262b477b39cbb3