diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 81fb2deb4554967555139034b27da27996c0d323..d6ced6296188b9e8e6303a12d1eb618aa2be2ccd 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -571,7 +571,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
             Ogg_ResetStreamHelper( p_sys );
 
-            if ( p_sys->i_bitrate == 0 )
+            if ( p_sys->i_bitrate == 0 || p_sys->b_partial_bitrate )
             {
                 /* we won't be able to find block by time
                  * we'll need to bisect search from here
@@ -1653,7 +1653,12 @@ static int Ogg_BeginningOfStream( demux_t *p_demux )
             es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es );
         }
 
-        p_ogg->i_bitrate += p_stream->fmt.i_bitrate;
+        if ( p_stream->fmt.i_bitrate == 0  &&
+             ( p_stream->fmt.i_cat == VIDEO_ES ||
+               p_stream->fmt.i_cat == AUDIO_ES ) )
+            p_ogg->b_partial_bitrate = true;
+        else
+            p_ogg->i_bitrate += p_stream->fmt.i_bitrate;
 
         p_stream->i_pcr = p_stream->i_previous_pcr =
             p_stream->i_interpolated_pcr = -1;
diff --git a/modules/demux/ogg.h b/modules/demux/ogg.h
index cc3e54c3f768da93db97e93c1f4a76d5ed799ec0..606282c433283d5bf0278fa8dcf0880123d669c4 100644
--- a/modules/demux/ogg.h
+++ b/modules/demux/ogg.h
@@ -102,6 +102,7 @@ struct demux_sys_t
 
     /* bitrate */
     int     i_bitrate;
+    bool    b_partial_bitrate;
 
     /* after reading all headers, the first data page is stuffed into the relevant stream, ready to use */
     bool    b_page_waiting;