diff --git a/tools/thanos/thanos.cpp b/tools/thanos/thanos.cpp
index 5fd23d58cce5ea012fd031f15362a02d9184d028..fc2e7cabc27d237eee3e7da997a8ff9d46c30b55 100644
--- a/tools/thanos/thanos.cpp
+++ b/tools/thanos/thanos.cpp
@@ -273,6 +273,11 @@ int ThanosPlugin_t::runPlugin()
 			dup2(fileno(logfile), STDOUT_FILENO);
 			dup2(fileno(logfile), STDERR_FILENO);
 		}
+		else
+		{
+			dup2(new_stdout_fd, STDOUT_FILENO);
+			dup2(new_stderr_fd, STDERR_FILENO);
+		}
 	}
 	
 
@@ -296,8 +301,8 @@ int ThanosPlugin_t::runPlugin()
         cout<< "#ATTRIBUTE step_exitcode="<<dec<<step_result<<endl;
 
 
-	dup2(new_stdout_fd, STDOUT_FILENO);
-	dup2(new_stderr_fd, STDERR_FILENO);
+	dup2(thanos_log_fd, STDOUT_FILENO);
+	dup2(thanos_log_fd, STDERR_FILENO);
 	if(logfile)
 		fclose(logfile);