diff --git a/plugins/woocommerce-admin/changelogs/fix-8239_shipping_task b/plugins/woocommerce-admin/changelogs/fix-8239_shipping_task
new file mode 100644
index 00000000000..4981fad2cf8
--- /dev/null
+++ b/plugins/woocommerce-admin/changelogs/fix-8239_shipping_task
@@ -0,0 +1,4 @@
+Significance: patch
+Type: Fix
+
+Fix Shipping task sometimes skipping the set shipping costs step. #8260
diff --git a/plugins/woocommerce-admin/client/tasks/fills/shipping/index.js b/plugins/woocommerce-admin/client/tasks/fills/shipping/index.js
index 683aca4d3ea..b5a0fd08a08 100644
--- a/plugins/woocommerce-admin/client/tasks/fills/shipping/index.js
+++ b/plugins/woocommerce-admin/client/tasks/fills/shipping/index.js
@@ -214,7 +214,7 @@ export class Shipping extends Component {
 							recordEvent( 'tasklist_shipping_set_location', {
 								country,
 							} );
-							this.completeStep();
+							// Don't need to trigger completeStep here as it's triggered by the address updates in the componentDidUpdate function.
 						} }
 					/>
 				),