diff --git a/apollo_fpga/commands/cli.py b/apollo_fpga/commands/cli.py
index 2f699a3..da88939 100755
--- a/apollo_fpga/commands/cli.py
+++ b/apollo_fpga/commands/cli.py
@@ -145,6 +145,9 @@ def configure_fpga(device, args):
 
         programmer.configure(bitstream)
 
+    # Let the LUNA gateware take over in devices with shared USB port
+    device.honor_fpga_adv()
+
 
 def ensure_unconfigured(device):
     with device.jtag as jtag:
@@ -170,6 +173,9 @@ def program_flash(device, args):
         programmer.flash(bitstream)
 
     device.soft_reset()
+    
+    # Let the LUNA gateware take over in devices with shared USB port
+    device.honor_fpga_adv()
 
 def read_back_flash(device, args):
 
diff --git a/apollo_fpga/ecp5.py b/apollo_fpga/ecp5.py
index 3e742e2..671c04e 100644
--- a/apollo_fpga/ecp5.py
+++ b/apollo_fpga/ecp5.py
@@ -463,9 +463,6 @@ def configure(self, bitstream):
         finally:
             self.chain.debugger.set_led_pattern(self.chain.debugger.LED_PATTERN_IDLE)
 
-            # Let the LUNA gateware take over in devices with shared USB port
-            self.chain.debugger.honor_fpga_adv()
-
 
     def _restart_configuration_process(self):
         """ Restarts the configuration process; equivalent to toggling the PROGRAM_N pin. """
diff --git a/firmware/src/vendor.c b/firmware/src/vendor.c
index 5105a42..2227ef5 100644
--- a/firmware/src/vendor.c
+++ b/firmware/src/vendor.c
@@ -91,7 +91,6 @@ bool handle_set_led_pattern(uint8_t rhport, tusb_control_request_t const* reques
 bool handle_trigger_fpga_reconfiguration(uint8_t rhport, tusb_control_request_t const* request)
 {
 	trigger_fpga_reconfiguration();
-	honor_fpga_adv();
 	return true;
 }