1 files changed, 4 insertions, 3 deletions
diff --git a/src/fsm.c b/src/fsm.c
index 8fedae26..6649b091 100644
--- a/src/fsm.c
+++ b/src/fsm.c
@@ -323,14 +323,15 @@ int osmo_fsm_inst_state_chg(struct osmo_fsm_inst *fi, uint32_t new_state,
 	LOGPFSM(fi, "state_chg to %s\n", osmo_fsm_state_name(fsm, new_state));
 	fi->state = new_state;
 
-	if (st->onenter)
-		st->onenter(fi, old_state);
-
 	if (timeout_secs) {
 		fi->T = T;
 		osmo_timer_schedule(&fi->timer, timeout_secs, 0);
 	}
 
+	/* Call 'onenter' last, user might terminate FSM from there */
+	if (st->onenter)
+		st->onenter(fi, old_state);
+
 	return 0;
 }