diff --git a/tmtc_client_cli.py b/tmtc_client_cli.py
index e31b5c4..283376e 100644
--- a/tmtc_client_cli.py
+++ b/tmtc_client_cli.py
@@ -32,7 +32,7 @@ from config.hook_implementations import EiveHookObject
 from config.definitions import PUS_APID
 from pus_tm.factory_hook import ccsds_tm_handler
 try:
-    from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander
+    from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander, add_ccsds_handler
     from tmtccmd.ccsds.handler import CcsdsTmHandler
 except ImportError as error:
     run_tmtc_commander = None
@@ -48,6 +48,7 @@ def main():
     initialize_tmtc_commander(hook_object=hook_obj)
     ccsds_handler = CcsdsTmHandler()
     ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50)
+    add_ccsds_handler(ccsds_handler)
     run_tmtc_commander(False)
 
 
diff --git a/tmtccmd b/tmtccmd
index ec23093..b4358a1 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit ec23093bff4c70ab0044f1bb049c64a2376ec927
+Subproject commit b4358a15fd945a9e0103a707b2a2dc56c458b24a