diff --git a/tapeserver/daemon/DriveHandler.cpp b/tapeserver/daemon/DriveHandler.cpp
index 0d0035b2d87b43364d7e7f9918100ecd0429c8b9..5f28a35425b65881c045912362851c635907f3ca 100644
--- a/tapeserver/daemon/DriveHandler.cpp
+++ b/tapeserver/daemon/DriveHandler.cpp
@@ -78,7 +78,8 @@ const std::map<SessionState, DriveHandler::Timeout> DriveHandler::m_stateChangeT
   // We expect the process to exit within 5 minutes of getting in this state. This state
   // potentially covers the draining of metadata to central storage (if not faster that 
   // unmounting the tape).
-  {SessionState::ShuttingDown, std::chrono::duration_cast<Timeout>(std::chrono::minutes(5))}
+  // TODO: this is set temporarily to 15 minutes while the reporting is not yet parallelized.
+  {SessionState::ShuttingDown, std::chrono::duration_cast<Timeout>(std::chrono::minutes(15))}
 };
 
 //------------------------------------------------------------------------------