diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index ecc7e4f139..b4d9bcec4e 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -496,7 +496,7 @@ static void crossfade_process_buffer(size_t fade_in_delay,
 
         /* Find the right chunk to start fading out */
         fade_out_delay += crossfade_sample * 2;
-        while (fade_out_delay >= fade_out_chunk->size)
+        while (fade_out_delay != 0 && fade_out_delay >= fade_out_chunk->size)
         {
             fade_out_delay -= fade_out_chunk->size;
             fade_out_chunk = fade_out_chunk->link;
@@ -533,7 +533,7 @@ static void crossfade_process_buffer(size_t fade_in_delay,
 
     /* Find the right chunk and sample to start fading in */
     fade_in_delay += crossfade_sample * 2;
-    while (fade_in_delay >= crossfade_chunk->size)
+    while (fade_in_delay != 0 && fade_in_delay >= crossfade_chunk->size)
     {
         fade_in_delay -= crossfade_chunk->size;
         crossfade_chunk = crossfade_chunk->link;