diff --git a/mission/com/LiveTmTask.cpp b/mission/com/LiveTmTask.cpp
index 56fe5a51..c671090c 100644
--- a/mission/com/LiveTmTask.cpp
+++ b/mission/com/LiveTmTask.cpp
@@ -173,15 +173,16 @@ ReturnValue_t LiveTmTask::handleGenericTmQueue(MessageQueueIF& queue, bool isCfd
     size_t writtenSize = 0;
     result = channel.write(data, size, writtenSize);
     if (result == DirectTmSinkIF::PARTIALLY_WRITTEN) {
-      result = channel.handleWriteCompletionSynchronously(writtenSize, 200);
+      result = channel.handleWriteCompletionSynchronously(writtenSize, 400);
       if (result != returnvalue::OK) {
         // TODO: Event? Might lead to dangerous spam though..
         sif::warning << "LiveTmTask: Synchronous write of last segment failed with code 0x"
-                     << std::setw(4) << std::hex << result << std::dec << std::endl;
+                     << std::setfill('0') << std::setw(4) << std::hex << result << std::dec
+                     << std::endl;
       }
     } else if (result != returnvalue::OK) {
-      sif::error << "LiveTmTask: Channel write failed with code 0x" << std::hex << std::setw(4)
-                 << result << std::dec << std::endl;
+      sif::error << "LiveTmTask: Channel write failed with code 0x" << std::setfill('0') << std::hex
+                 << std::setw(4) << result << std::dec << std::endl;
     }
   }
   // Try delete in any case, ignore failures (which should not happen), it is more important to
diff --git a/mission/com/TmStoreTaskBase.cpp b/mission/com/TmStoreTaskBase.cpp
index 215cef08..9e86ba08 100644
--- a/mission/com/TmStoreTaskBase.cpp
+++ b/mission/com/TmStoreTaskBase.cpp
@@ -141,11 +141,12 @@ ReturnValue_t TmStoreTaskBase::performDump(PersistentTmStoreWithTmQueue& store,
   size_t writtenSize = 0;
   result = channel.write(tmReader.getFullData(), dumpedLen, writtenSize);
   if (result == VirtualChannelIF::PARTIALLY_WRITTEN) {
-    result = channel.handleWriteCompletionSynchronously(writtenSize, 200);
+    result = channel.handleWriteCompletionSynchronously(writtenSize, 400);
     if (result != returnvalue::OK) {
       // TODO: Event? Might lead to dangerous spam though..
-      sif::warning << "PersistentTmStore: Synchronous write of last segment failed with code 0x"
-                   << std::setw(4) << std::hex << result << std::dec << std::endl;
+      sif::warning << "LiveTmTask: Synchronous write of last segment failed with code 0x"
+                   << std::setfill('0') << std::setw(4) << std::hex << result << std::dec
+                   << std::endl;
     }
   } else if (result == DirectTmSinkIF::IS_BUSY) {
     sif::warning << "PersistentTmStore: Unexpected VC channel busy" << std::endl;
diff --git a/mission/com/VirtualChannel.cpp b/mission/com/VirtualChannel.cpp
index e531727e..a75959e6 100644
--- a/mission/com/VirtualChannel.cpp
+++ b/mission/com/VirtualChannel.cpp
@@ -74,5 +74,7 @@ ReturnValue_t VirtualChannel::handleWriteCompletionSynchronously(size_t& written
       return result;
     }
   }
-  return returnvalue::FAILED;
+  // Timeout. Cancel the transfer
+  cancelTransfer();
+  return TIMEOUT;
 }
diff --git a/mission/com/VirtualChannelWithQueue.cpp b/mission/com/VirtualChannelWithQueue.cpp
index 0d9e4d11..fb3375dc 100644
--- a/mission/com/VirtualChannelWithQueue.cpp
+++ b/mission/com/VirtualChannelWithQueue.cpp
@@ -41,7 +41,7 @@ ReturnValue_t VirtualChannelWithQueue::handleNextTm(bool performWriteOp) {
   if (performWriteOp) {
     result = write(data, size, writtenSize);
     if (result == PARTIALLY_WRITTEN) {
-      result = handleWriteCompletionSynchronously(writtenSize, 200);
+      result = handleWriteCompletionSynchronously(writtenSize, 400);
       if (result != returnvalue::OK) {
         // TODO: Event? Might lead to dangerous spam though..
         sif::warning
diff --git a/mission/tmtc/DirectTmSinkIF.h b/mission/tmtc/DirectTmSinkIF.h
index ff8ab6fe..546b293e 100644
--- a/mission/tmtc/DirectTmSinkIF.h
+++ b/mission/tmtc/DirectTmSinkIF.h
@@ -15,6 +15,7 @@ class DirectTmSinkIF {
   static constexpr ReturnValue_t IS_BUSY = returnvalue::makeCode(CLASS_ID, 0);
   static constexpr ReturnValue_t PARTIALLY_WRITTEN = returnvalue::makeCode(CLASS_ID, 1);
   static constexpr ReturnValue_t NO_WRITE_ACTIVE = returnvalue::makeCode(CLASS_ID, 2);
+  static constexpr ReturnValue_t TIMEOUT = returnvalue::makeCode(CLASS_ID, 3);
 
   /**
    * @brief   Implements the functionality to write to a TM sink directly.