diff --git a/Audiotool/builders/LuaBuilder.cs b/Audiotool/builders/LuaBuilder.cs
index 5d474bc..593daec 100644
--- a/Audiotool/builders/LuaBuilder.cs
+++ b/Audiotool/builders/LuaBuilder.cs
@@ -64,8 +64,12 @@ private static void GenerateClientFile(List<Audio> AudioFiles, string soundSetNa
         _clientFile.Add("");
         _clientFile.Add("        for sound in pairs(sounds) do");
         _clientFile.Add("            print(\"Playing sound \" .. sound)");
-        _clientFile.Add($"            PlaySoundFromEntity(-1, sound, PlayerPedId(), '{soundSetName}', 0, 0)");
-        _clientFile.Add("            Wait(500)");
+        _clientFile.Add("             local soundId = GetSoundId()");
+        _clientFile.Add($"            PlaySoundFromEntity(soundId, sound, PlayerPedId(), '{soundSetName}', 0, 0)");
+        _clientFile.Add($"            while not HasSoundFinished(soundId) do");
+        _clientFile.Add($"              Wait(0)");
+        _clientFile.Add($"            end");
+        _clientFile.Add("             ReleaseSoundId(soundId)");
         _clientFile.Add("        end");
         _clientFile.Add("    end");
         _clientFile.Add("end, false)");