diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c
index 28a80a770c..7044c44edf 100644
--- a/ports/raspberrypi/audio_dma.c
+++ b/ports/raspberrypi/audio_dma.c
@@ -352,6 +352,8 @@ bool audio_dma_get_paused(audio_dma_t *dma) {
 void audio_dma_init(audio_dma_t *dma) {
     dma->first_buffer = NULL;
     dma->second_buffer = NULL;
+    dma->channel[0] = NUM_DMA_CHANNELS;
+    dma->channel[1] = NUM_DMA_CHANNELS;
 }
 
 void audio_dma_deinit(audio_dma_t *dma) {
@@ -368,7 +370,6 @@ bool audio_dma_get_playing(audio_dma_t *dma) {
     }
     if (!dma_channel_is_busy(dma->channel[0]) &&
         !dma_channel_is_busy(dma->channel[1])) {
-        audio_dma_stop(dma);
         return false;
     }
 
diff --git a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
index 4fef53ff0a..e191606577 100644
--- a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
+++ b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
@@ -102,6 +102,7 @@ void common_hal_audiopwmio_pwmaudioout_construct(audiopwmio_pwmaudioout_obj_t *s
     }
 
     audio_dma_init(&self->dma);
+    self->pacing_timer = NUM_DMA_TIMERS;
 
     self->quiescent_value = quiescent_value;
 }
@@ -126,6 +127,7 @@ void common_hal_audiopwmio_pwmaudioout_deinit(audiopwmio_pwmaudioout_obj_t *self
 }
 
 void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t *self, mp_obj_t sample, bool loop) {
+
     if (common_hal_audiopwmio_pwmaudioout_get_playing(self)) {
         common_hal_audiopwmio_pwmaudioout_stop(self);
     }
@@ -135,8 +137,8 @@ void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t *self,
     for (size_t i = 0; i < NUM_DMA_TIMERS; i++) {
         if (dma_hw->timer[i] == 0) {
             pacing_timer = i;
+            break;
         }
-        break;
     }
     if (pacing_timer == NUM_DMA_TIMERS) {
         mp_raise_RuntimeError(translate("No DMA pacing timer found"));