diff --git a/tmtc/.idea/runConfigurations/CFDP_Test.xml b/tmtc/.idea/runConfigurations/CFDP_Test.xml
index 00d0777..43d5c02 100644
--- a/tmtc/.idea/runConfigurations/CFDP_Test.xml
+++ b/tmtc/.idea/runConfigurations/CFDP_Test.xml
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="cfdp cfdp_test.txt /tmp/hello-cpy.txt" />
+    <option name="PARAMETERS" value="cfdp cfdp_test.txt /tmp/hello-cpy.txt -d 0.2" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc
index 8237591..51871a8 160000
--- a/tmtc/common_tmtc
+++ b/tmtc/common_tmtc
@@ -1 +1 @@
-Subproject commit 8237591c4c0c6a2d052be9b4f16527dd7b94df84
+Subproject commit 51871a887f8f3ffbcdb9f12c83b1ad309e8cf7b5
diff --git a/tmtc/deps/tmtccmd b/tmtc/deps/tmtccmd
index 2db12c1..b760e96 160000
--- a/tmtc/deps/tmtccmd
+++ b/tmtc/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit 2db12c163f150e7f17bb3b1497d5812435f7543d
+Subproject commit b760e969ccd958a89c3ed1ce2e9ebcd874713fe6
diff --git a/tmtc/tmtcc.py b/tmtc/tmtcc.py
index 2b47123..a10658c 100755
--- a/tmtc/tmtcc.py
+++ b/tmtc/tmtcc.py
@@ -48,6 +48,8 @@ def main():
                 LOGGER.info("TMTC Client in IDLE mode")
                 time.sleep(3.0)
             elif state.request == BackendRequest.DELAY_LISTENER:
+                if tc_handler.cfdp_done:
+                    sys.exit(0)
                 time.sleep(0.8)
             elif state.request == BackendRequest.DELAY_CUSTOM:
                 if state.next_delay.total_seconds() < 0.5: