diff --git a/eive_tmtc/tmtc/power/power.py b/eive_tmtc/tmtc/power/power.py
index c6e13cf..7430f34 100644
--- a/eive_tmtc/tmtc/power/power.py
+++ b/eive_tmtc/tmtc/power/power.py
@@ -55,7 +55,7 @@ def pack_power_commands(q: DefaultPusQueueHelper, op_code: str):
     if op_code in PowerOpCodes.SWITCHER_HK:
         q.add_log_cmd("Requesting switcher state HK")
         q.add_pus_tc(
-            create_request_one_hk_command(
+            create_request_one_diag_command(
                 make_sid(PCDU_HANDLER_ID, PcduSetIds.SWITCHER_SET)
             )
         )
@@ -88,13 +88,6 @@ def pack_power_commands(q: DefaultPusQueueHelper, op_code: str):
         pack_reset_gnd_wdt_cmd(q, "PDU1", oids[PDU_1_HANDLER_ID])
         pack_reset_gnd_wdt_cmd(q, "PDU2", oids[PDU_2_HANDLER_ID])
         q.add_wait_seconds(5.0)
-    elif op_code in PowerOpCodes.SWITCHER_HK:
-        q.add_log_cmd("PCDU: Requesting Switcher Set")
-        q.add_pus_tc(
-            create_request_one_diag_command(
-                make_sid(PCDU_HANDLER_ID, SetId.SWITCHER_SET)
-            )
-        )
     if q.empty():
         logging.getLogger(__name__).info(
             f"Queue is empty, no stack for op code {op_code}"