diff --git a/tcl/target/icepick.cfg b/tcl/target/icepick.cfg
index 3a0afdef2..36ffc022c 100644
--- a/tcl/target/icepick.cfg
+++ b/tcl/target/icepick.cfg
@@ -114,6 +114,7 @@ proc icepick_c_tapenable {jrc port} {
 proc icepick_d_tapenable {jrc port} {
 	# First CONNECT to the ICEPick
 	icepick_c_connect $jrc
+	icepick_c_setup $jrc
 
 	# Select the port
 	icepick_c_router $jrc 1 0x2 $port 0x2108