diff --git a/display.c b/display.c
--- a/display.c
+++ b/display.c
@@ -350,7 +350,6 @@ void display_process(therm_settings_t* s
 
             // Button handler
             if(SW_BTN_PRESSED) {
-		save_setpoints(&set); // TODO: Check for mod
                 status->state = STATE_IDLE;
             }
             else {
@@ -377,7 +376,6 @@ void display_process(therm_settings_t* s
 
             // Button handler
             if(SW_BTN_PRESSED) {
-		save_setpoints(&set); // TODO: Check for mod
                 status->state = STATE_IDLE;
             }
             else {
@@ -403,7 +401,6 @@ void display_process(therm_settings_t* s
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_IDLE;
-		save_setpoints(&set); // TODO: Check for mod
             }
             else {
                 user_input(&set->val.setpoint_steam);
@@ -430,7 +427,6 @@ void display_process(therm_settings_t* s
             // Button handler
             if(SW_BTN_PRESSED) {
                 status->state = STATE_IDLE;
-		save_setpoints(&set); // TODO: Check for mod
             }
             else {
                 user_input(&set->val.setpoint_steam);