diff --git a/tapeserver/daemon/DriveHandler.cpp b/tapeserver/daemon/DriveHandler.cpp
index 5f28a35425b65881c045912362851c635907f3ca..90151d655e98682524ec44277326e351394193a2 100644
--- a/tapeserver/daemon/DriveHandler.cpp
+++ b/tapeserver/daemon/DriveHandler.cpp
@@ -97,10 +97,11 @@ const std::map<SessionState, DriveHandler::Timeout> DriveHandler::m_heartbeatTim
 //------------------------------------------------------------------------------
 // The following structure represents the data movement timeouts for the session states involving
 // data movements and heartbeats.
-// TODO: decide on values
+// TODO: decide on values. TODO: bumped up to 15 minutes for the time being as the
+// efficient retrieve requests pop is not implemented yet.
 const std::map<SessionState, DriveHandler::Timeout> DriveHandler::m_dataMovementTimeouts = {
-  {SessionState::Running, std::chrono::duration_cast<Timeout>(std::chrono::minutes(5))},
-  {SessionState::DrainingToDisk, std::chrono::duration_cast<Timeout>(std::chrono::minutes(5))}
+  {SessionState::Running, std::chrono::duration_cast<Timeout>(std::chrono::minutes(15))},
+  {SessionState::DrainingToDisk, std::chrono::duration_cast<Timeout>(std::chrono::minutes(15))}
 };
 
 //------------------------------------------------------------------------------