diff --git a/src/OutputFileHandler.cc b/src/OutputFileHandler.cc
index fe65878258f59ab288879d0e4b65cd878a4217a9..44ca1b2336da80120b34c7bf010fd3ac7559d2d2 100644
--- a/src/OutputFileHandler.cc
+++ b/src/OutputFileHandler.cc
@@ -149,7 +149,7 @@ std::string OutputFileHandler::format_filename(uint32_t run_number, uint32_t ind
 
 void OutputFileHandler::close_and_rename::operator()() const {
   OutputFile outputFile;
-  while (file_handler_running_ || (files_to_close_.size() > 0)) {
+  while (file_handler_running_ && (files_to_close_.size() > 0)) {
     LOG(TRACE) << "try pop now. queue size now " << files_to_close_.size();
     try {
       files_to_close_.pop(outputFile);