diff --git a/components/hauslane/hauslane.cpp b/components/hauslane/hauslane.cpp
index 082af72..6f44562 100644
--- a/components/hauslane/hauslane.cpp
+++ b/components/hauslane/hauslane.cpp
@@ -225,6 +225,10 @@ void Hauslane::set_state(bool set_light, uint8_t set_speed) {
 		// save current state of light in memory
 		ESP_LOGD(TAG, "Received light state: %d", set_light);
 		this->light_cur = set_light;
+		if (!this->meet_target) {
+			// sync target light state if changed by button press
+			this->light_target = set_light;
+		}
 		// send light state to API if it is active
 		if (this->send_light_state) {
 			ESP_LOGD(TAG, "Sending new light state.");
@@ -235,6 +239,10 @@ void Hauslane::set_state(bool set_light, uint8_t set_speed) {
 		// save current state of fan in memory
 		ESP_LOGD(TAG, "Received fan speed: %d", set_speed);
 		this->speed = set_speed;
+		if (!this->meet_target) {
+			// sync target fan state if changed by button press
+			this->speed_target = set_speed;
+		}
 		// send fan state to API if it is active
 		if (this->send_fan_speed) {
 			ESP_LOGD(TAG,"Sending new fan speed.");