diff --git a/includes/admin/settings/class-wc-settings-shipping.php b/includes/admin/settings/class-wc-settings-shipping.php
index efc2d90c9a0..797551b0925 100644
--- a/includes/admin/settings/class-wc-settings-shipping.php
+++ b/includes/admin/settings/class-wc-settings-shipping.php
@@ -174,8 +174,11 @@ class WC_Settings_Shipping extends WC_Settings_Page {
 		switch ( $current_section ) {
 			case 'options':
 				WC_Admin_Settings::save_fields( $this->get_settings() );
+				do_action( 'woocommerce_update_options_' . $this->id . '_options' );
 				break;
 			case 'classes':
+				do_action( 'woocommerce_update_options_' . $this->id . '_classes' );
+				break;
 			case '':
 				break;
 			default:
@@ -189,10 +192,6 @@ class WC_Settings_Shipping extends WC_Settings_Page {
 				break;
 		}
 
-		if ( $current_section ) {
-			do_action( 'woocommerce_update_options_' . $this->id . '_' . $current_section );
-		}
-
 		// Increments the transient version to invalidate cache.
 		WC_Cache_Helper::get_transient_version( 'shipping', true );
 	}