diff --git a/src/core/tandem_run/tandembatchprocess.cpp b/src/core/tandem_run/tandembatchprocess.cpp
index 29e1572977056a8bd8e90fdc3cc1d52a7ee982ce..5d02124c7503ee94866df892dbc29c2996813a73 100644
--- a/src/core/tandem_run/tandembatchprocess.cpp
+++ b/src/core/tandem_run/tandembatchprocess.cpp
@@ -36,6 +36,7 @@
 TandemBatchProcess::TandemBatchProcess(WorkMonitorInterface * p_monitor, const TandemRunBatch & tandem_run_batch) {
     _tandem_run_batch = tandem_run_batch;
     _p_monitor = p_monitor;
+    _tmp_database_file.setAutoRemove(true);
 }
 
 TandemBatchProcess::~TandemBatchProcess() {
@@ -67,7 +68,6 @@ void TandemBatchProcess::writeXmlDatabaseFile (QXmlStreamWriter * p_out) {
 }
 
 void TandemBatchProcess::prepareXmlDatabaseFile() {
-    _tmp_database_file.setAutoRemove(true);
 
     if (_tmp_database_file.open())
     {
@@ -177,7 +177,7 @@ void TandemBatchProcess::writeXmlInputFile (QXmlStreamWriter * p_out, const QStr
 
 void TandemBatchProcess::runOne(const QString & mz_file) {
     QTemporaryFile xml_input_file;
-    xml_input_file.setAutoRemove(false);
+    xml_input_file.setAutoRemove(true);
     if (xml_input_file.open())
     {
         QXmlStreamWriter * p_out = new QXmlStreamWriter();