diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 1866dab9e7..0a0973c6d9 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -534,6 +534,8 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "The answer to life, universe and everything is not correct!\n");
         return -1;
     }
+    // Reset these pointers so we can tell if they were set this frame
+    s->stripsizes = s->stripdata = NULL;
     /* parse image file directory */
     off = tget_long(&buf, le);
     if (off >= UINT_MAX - 14 || end_buf - orig_buf < off + 14) {