diff --git a/includes/Api/ShippingController.php b/includes/Api/ShippingController.php
index cb9a61f..8f84bc6 100644
--- a/includes/Api/ShippingController.php
+++ b/includes/Api/ShippingController.php
@@ -258,17 +258,21 @@ class ShippingController extends WP_REST_Controller {
 
 					// Get current settings
 					$method->init_instance_settings();
-					$current_settings = $method->instance_settings;
-
-					// Update enabled status
-					$method->instance_settings['enabled'] = $enabled ? 'yes' : 'no';
-
-					// Debug: Log settings change
-					error_log( sprintf( '[WooNooW] Current enabled: %s, New enabled: %s', 
-						isset( $current_settings['enabled'] ) ? $current_settings['enabled'] : 'not set',
-						$method->instance_settings['enabled']
+					
+					// Debug: Log current state from BOTH sources
+					error_log( sprintf( '[WooNooW] Current $method->enabled: %s, instance_settings["enabled"]: %s', 
+						isset( $method->enabled ) ? $method->enabled : 'not set',
+						isset( $method->instance_settings['enabled'] ) ? $method->instance_settings['enabled'] : 'not set'
 					) );
 
+					// Update BOTH the property AND the settings
+					$new_enabled_value = $enabled ? 'yes' : 'no';
+					$method->enabled = $new_enabled_value;
+					$method->instance_settings['enabled'] = $new_enabled_value;
+
+					// Debug: Log new state
+					error_log( sprintf( '[WooNooW] New enabled value: %s', $new_enabled_value ) );
+
 					// Save to database
 					$option_key = $method->get_instance_option_key();
 					$saved = update_option( $option_key, $method->instance_settings, 'yes' );