2 files changed, 5 insertions, 1 deletions

diff --git a/apps/playback.c b/apps/playback.c
index e7c1040378..3cdfed96cd 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1648,11 +1648,15 @@ void audio_stop(void)
 void audio_pause(void)
 {
     queue_post(&audio_queue, AUDIO_PAUSE, 0);
+    while (!paused && playing)
+        yield();
 }
 
 void audio_resume(void)
 {
     queue_post(&audio_queue, AUDIO_RESUME, 0);
+    while (paused && playing)
+        yield();
 }
 
 void audio_next(void)
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c
index b63b12f197..b582cf8c65 100644
--- a/firmware/pcm_playback.c
+++ b/firmware/pcm_playback.c
@@ -287,7 +287,7 @@ void pcm_play_pause(bool play)
         IIS2CONFIG = (pcm_freq << 12) | 0x300 | 4 << 2;
         EBU1CONFIG = 7 << 12 |  3 << 8 | 5 << 2;
         DCR0 |= DMA_EEXT | DMA_START;
-        sleep(HZ/8);
+        
         uda1380_mute(false);
     }
     else if(!pcm_paused && !play)