diff --git a/litex/build/xilinx/programmer.py b/litex/build/xilinx/programmer.py
index 466cee57c..b28ab94c6 100644
--- a/litex/build/xilinx/programmer.py
+++ b/litex/build/xilinx/programmer.py
@@ -95,7 +95,7 @@ class VivadoProgrammer(GenericProgrammer):
     def load_bitstream(self, bitstream_file):
         cmds = """open_hw
 connect_hw_server
-open_hw_target [lindex [get_hw_targets -of_objects [get_hw_servers localhost]] 0]
+open_hw_target
 
 set_property PROBES.FILE {{}} [lindex [get_hw_devices] 0]
 set_property PROGRAM.FILE {{{bitstream}}} [lindex [get_hw_devices] 0]
@@ -111,7 +111,7 @@ quit
     def flash(self, address, data_file):
         cmds = """open_hw
 connect_hw_server
-open_hw_target [lindex [get_hw_targets -of_objects [get_hw_servers localhost]] 0]
+open_hw_target
 create_hw_cfgmem -hw_device [lindex [get_hw_devices] 0] -mem_dev  [lindex [get_cfgmem_parts {{{flash_part}}}] 0]
 
 set_property PROGRAM.BLANK_CHECK  0 [ get_property PROGRAM.HW_CFGMEM [lindex [get_hw_devices] 0 ]]