diff --git a/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs b/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs
index f46bc60..64d3800 100644
--- a/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs
+++ b/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs
@@ -39,7 +39,7 @@ namespace Code.Audio
             SoundtrackListConfig soundtrackListConfig,
             SFXListConfig sfxListConfig, 
             EnemiesSoundListConfig enemiesSoundListConfig,
-            DispatcherSoundListConfig dispatcherSoundListConfig//, CharacterSoundListConfig characterSoundListConfig
+            DispatcherSoundListConfig dispatcherSoundListConfig
             )
         {
             AudioMixer = audioMixerConfig.audioMixerAsset;
@@ -51,7 +51,6 @@ namespace Code.Audio
             _SFX = sfxListConfig.SFX;
             _enemies = enemiesSoundListConfig.enemies;
             _dispatcher = dispatcherSoundListConfig.dispatcher;
-            // _character = characterSoundListConfig.character;
             
             MusicDictionary.Add(MusicType.Menu, new ());
             MusicDictionary.Add(MusicType.Peaceful, new ());
diff --git a/Game/CourierOld/Assets/Code/Audio/AudioService.cs b/Game/CourierOld/Assets/Code/Audio/AudioService.cs
index 3211705..c76c331 100644
--- a/Game/CourierOld/Assets/Code/Audio/AudioService.cs
+++ b/Game/CourierOld/Assets/Code/Audio/AudioService.cs
@@ -99,19 +99,21 @@ namespace Code.Audio
             // await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
             //     _ => !_musicAudioSources[musicType].isPlaying,
             //     cancellationToken: _cancellationTokenSources[musicType].Token);
-            await UniTask.WaitUntil(() => _musicAudioSources[musicType].isPlaying);
-            Debug.Log($"Playing {musicType}");
-            var isCanceled = await UniTask.WaitUntil(() => !_musicAudioSources[musicType].isPlaying,
+            await UniTask.NextFrame();
+            // Debug.Log($"Playing {musicType}");
+            var (isCanceled, _) = await UniTask.WaitUntilValueChanged(_musicAudioSources[musicType],
+                     _ => !_musicAudioSources[musicType].isPlaying,
                 cancellationToken: _cancellationTokenSources[musicType].Token).SuppressCancellationThrow();
-            Debug.Log($"Finished {musicType}");
+            // Debug.Log($"Finished {musicType}");
             
             if (isCanceled)
             {
-                Debug.Log($"Cancelled {musicType}");
+                // Debug.Log($"Cancelled {musicType}");
                 _cancellationTokenSources[musicType].Dispose();
                 _cancellationTokenSources[musicType] = new();
                 
                 _audioSourcePool.ReleaseSource(_musicAudioSources[musicType]);
+                _musicAudioSources[musicType] = null;
                 
                 return;
             }