diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index e243998..168f7d4 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -2,6 +2,7 @@
 """
 from config.object_ids import get_object_ids
 from spacepackets.ecss import PusTelemetry
+from spacepackets.ecss.pus_17_test import Service17Tm
 from spacepackets.util import PrintFormats
 from tmtccmd import get_console_logger
 from tmtccmd.logging.pus import RawTmtcTimedLogWrapper
@@ -46,8 +47,10 @@ def pus_factory_hook(
     elif service == 8:
         handle_action_reply(raw_tm=packet, printer=printer, obj_id_dict=obj_id_dict)
     elif service == 17:
-        tm_packet = Service17TmExtended.unpack(raw_telemetry=packet)
-        dedicated_handler = False
+        tm_packet = Service17Tm.unpack(raw_telemetry=packet)
+        if tm_packet.subservice == 2:
+            verif_wrapper.dlog("Received Ping Reply TM[17,2]")
+        dedicated_handler = True
     elif service == 20:
         tm_packet = Service20FsfwTm.unpack(raw_telemetry=packet)
         dedicated_handler = False