diff --git a/arduino/sonoffliving/sonoffliving.cpp b/arduino/sonoffliving/sonoffliving.cpp
index ec80dd4..031dc37 100644
--- a/arduino/sonoffliving/sonoffliving.cpp
+++ b/arduino/sonoffliving/sonoffliving.cpp
@@ -42,7 +42,7 @@ void setupSonOff() {
   pinMode(LED_PIN, OUTPUT);
   pinMode(RELAY_PIN, OUTPUT);
   pinMode(BUTTON_PIN, INPUT);
-  relayState = false;
+  relayState = true;
   btn_timer.attach(0.05, button);
 }
 
diff --git a/home-assistant/conf_switch.d/sonoff_living.yaml b/home-assistant/conf_switch.d/sonoff_living.yaml
index 6353da6..013938b 100644
--- a/home-assistant/conf_switch.d/sonoff_living.yaml
+++ b/home-assistant/conf_switch.d/sonoff_living.yaml
@@ -5,4 +5,3 @@
   qos: 0
   payload_on: "ON"
   payload_off: "OFF"
-  retain: true