diff --git a/libavformat/udp.c b/libavformat/udp.c
index 281f5158b3..3cdee067f2 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -556,6 +556,8 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
                 av_fifo_generic_read(s->fifo, buf, avail, NULL);
                 av_fifo_drain(s->fifo, AV_RL32(tmp) - avail);
                 return avail;
+            } else if(s->circular_buffer_error){
+                return s->circular_buffer_error;
             }
             else {
                 FD_ZERO(&rfds);