diff --git a/mission/com/LiveTmTask.cpp b/mission/com/LiveTmTask.cpp
index 32916afb..48e7476c 100644
--- a/mission/com/LiveTmTask.cpp
+++ b/mission/com/LiveTmTask.cpp
@@ -155,7 +155,7 @@ ReturnValue_t LiveTmTask::handleGenericTmQueue(MessageQueueIF& queue, bool isCfd
   if (isCfdp and signals::CFDP_MSG_COUNTER > 0) {
     signals::CFDP_MSG_COUNTER--;
   }
-  if (DEBUG_CFDP_TO_LIVE_TM_TASK) {
+  if (DEBUG_CFDP_TO_LIVE_TM_TASK and signals::CFDP_MSG_COUNTER > 0) {
     sif::debug << "LiveTmTask: CFDP message counter: " << signals::CFDP_MSG_COUNTER << std::endl;
   }
   store_address_t storeId = message.getStorageId();