diff --git a/src/output-file.c b/src/output-file.c
index c2a7027540..832e2e9923 100644
--- a/src/output-file.c
+++ b/src/output-file.c
@@ -96,11 +96,14 @@ int OutputRegisterFileLogger(LoggerId id, const char *name, FileLogger LogFunc,
 
 static void CloseFile(const Packet *p, Flow *f, File *file)
 {
+    DEBUG_VALIDATE_BUG_ON((file->flags & FILE_LOGGED) != 0);
     void *txv = AppLayerParserGetTx(p->proto, f->alproto, f->alstate, file->txid);
     if (txv) {
         AppLayerTxData *txd = AppLayerParserGetTxData(p->proto, f->alproto, txv);
-        if (txd)
+        if (txd) {
             txd->files_logged++;
+            DEBUG_VALIDATE_BUG_ON(txd->files_logged > txd->files_opened);
+        }
     }
     file->flags |= FILE_LOGGED;
 }