diff --git a/src/c/main.c b/src/c/main.c
index c3a1855..db684b0 100644
--- a/src/c/main.c
+++ b/src/c/main.c
@@ -91,6 +91,7 @@ static void click_handler_disable_tutorial(void *recognizer, void *ctx) {
 
 static void click_handler_push_setter(void *recognizer, void *ctx) {
 	s_highlight_pos = 0;
+	s_alarm_reason = WAKE_MAIN_ALARM; // going back to setter means alarm was disarmed or failed to set; do not punish user
 	window_stack_pop_all(true);
 	push_setter_window();
 }
@@ -200,7 +201,6 @@ static void send_zap() {
 	if (result != APP_MSG_OK) {
 		return;
 	}
-	return;
 }
 
 ////////////////////// MISC //////////////////////