diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index c4e64c85f7..bb20a81509 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -2827,9 +2827,9 @@ gst_ogg_demux_read_end_chain (GstOggDemux * ogg, GstOggChain * chain)
         if (pad->map.serialno == ogg_page_serialno (&og)) {
           gint64 granulepos = ogg_page_granulepos (&og);
 
-          last_granule = granulepos;
-          last_pad = pad;
-          if (last_granule != -1) {
+          if (granulepos != -1) {
+            last_granule = granulepos;
+            last_pad = pad;
             done = TRUE;
           }
           break;