--- a/src/source-pcap-file-directory-helper.c
+++ b/src/source-pcap-file-directory-helper.c
@@ -442,6 +442,7 @@
                     status = PcapFileDispatch(pftv);
 
                     CleanupPcapFileFileVars(pftv);
+                    pv->current_file = NULL;
 
                     if (status == TM_ECODE_FAILED) {
                         CleanupPendingFile(current_file);
@@ -457,7 +458,6 @@
                     }
 
                     CleanupPendingFile(current_file);
-                    pv->current_file = NULL;
 
                     status = PcapRunStatus(pv);
                 }