diff --git a/scripts/openroad/common/grt.tcl b/scripts/openroad/common/grt.tcl
index 798bec50a..97cdb15c5 100644
--- a/scripts/openroad/common/grt.tcl
+++ b/scripts/openroad/common/grt.tcl
@@ -28,6 +28,3 @@ if { $::env(GRT_ALLOW_CONGESTION) == 1 } {
 puts $arg_list
 global_route {*}$arg_list
 
-if { $::env(GRT_REPAIR_ANTENNAS) } {
-    repair_antennas "$::env(DIODE_CELL)" -iterations $::env(GRT_ANT_ITERS) -ratio_margin $::env(GRT_ANT_MARGIN)
-}
diff --git a/scripts/tcl_commands/routing.tcl b/scripts/tcl_commands/routing.tcl
index 7accf1b6b..cb1705fdb 100755
--- a/scripts/tcl_commands/routing.tcl
+++ b/scripts/tcl_commands/routing.tcl
@@ -39,15 +39,15 @@ proc global_routing_fastroute {args} {
     set initial_odb [index_file $::env(routing_tmpfiles)/global.odb]
 
     set ::env(GRT_CONGESTION_REPORT_FILE) $::env(routing_tmpfiles)/groute-congestion.rpt
-    run_openroad_script $::env(SCRIPTS_DIR)/openroad/repair_antennas.tcl\
-        -indexed_log $log\
-        -save "def=$initial_def,guide=$initial_guide,odb=$initial_odb"\
-        -no_update_current
 
     if { $::env(GRT_REPAIR_ANTENNAS) } {
         puts_info "Starting OpenROAD Antenna Repair Iterations..."
-        set iter 1
+        run_openroad_script $::env(SCRIPTS_DIR)/openroad/repair_antennas.tcl\
+            -indexed_log $log\
+            -save "def=$initial_def,guide=$initial_guide,odb=$initial_odb"\
+            -no_update_current
 
+        set iter 1
         set minimum_def $initial_def
         set minimum_guide $initial_guide
         set minimum_odb $initial_odb
@@ -85,6 +85,11 @@ proc global_routing_fastroute {args} {
             }
             incr iter
         }
+    } else {
+        run_openroad_script $::env(SCRIPTS_DIR)/openroad/groute.tcl\
+            -indexed_log $log\
+            -save "def=$initial_def,guide=$initial_guide,odb=$initial_odb"\
+            -no_update_current
     }
 
     set_def $::env(SAVE_DEF)