diff --git a/src/tuxedo_io/tongfang_wmi.h b/src/tuxedo_io/tongfang_wmi.h
index c331062..db35f64 100644
--- a/src/tuxedo_io/tongfang_wmi.h
+++ b/src/tuxedo_io/tongfang_wmi.h
@@ -291,9 +291,6 @@ static void uniwill_init(void)
 		uw_ec_write_addr(0x43 + i, 0x07, reg_read_return.bytes.data_low, 0x00, &reg_write_return);
 	}
 
-    // Enable manual mode
-    uw_ec_write_addr(0x41, 0x07, 0x01, 0x00, &reg_write_return);
-
     // Zero second fan temp for detection
     uw_ec_write_addr(0x4f, 0x04, 0x00, 0x00, &reg_write_return);
 }
@@ -302,8 +299,6 @@ static void uniwill_exit(void)
 {
     union uw_ec_write_return reg_write_return;
 
-    // Disable manual mode
-    uw_ec_write_addr(0x41, 0x07, 0x00, 0x00, &reg_write_return);
 }
 
 static u32 uw_set_fan(u32 fan_index, u8 fan_speed)
diff --git a/src/uniwill_keyboard.h b/src/uniwill_keyboard.h
index 52891a5..ae6f1eb 100644
--- a/src/uniwill_keyboard.h
+++ b/src/uniwill_keyboard.h
@@ -876,6 +876,9 @@ static int uniwill_keyboard_remove(struct platform_device *dev)
 	if (uw_lightbar_loaded)
 		uw_lightbar_remove(dev);
 
+	// Disable manual mode
+	uniwill_write_ec_ram(0x0741, 0x00);
+
 	return 0;
 }