diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 6a0ed04c9..bc3a666a2 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -650,19 +650,20 @@ Debug(5, "After av_read_frame (%d)", ret );
         return 0;
       }
     } else {
+      // Not recording
       if ( videoStore ) {
         Info("Deleting videoStore instance");
         delete videoStore;
         videoStore = NULL;
       }
-
-      //Buffer video packets
-      if ( packet->flags & AV_PKT_FLAG_KEY ) {
-        packetqueue.clearQueue();
-      }
-      packetqueue.queuePacket(packet);
     } // end if
 
+    //Buffer video packets
+    if ( packet->flags & AV_PKT_FLAG_KEY ) {
+      packetqueue.clearQueue();
+    }
+    packetqueue.queuePacket(packet);
+
     if ( packet->stream_index == mVideoStreamId ) {
       ret = zm_avcodec_decode_video( mVideoCodecContext, mRawFrame, &frameComplete, packet );
       if ( ret < 0 ) {