diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index fff1c2b97..30f43d077 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -362,7 +362,10 @@ static int l1ctl_rx_fbsb_req(struct l1ctl_link *l1l, struct msgb *msg)
 		trx_if_cmd_txtune(l1l->trx, band_arfcn);
 	}
 
-	trx_if_cmd_poweron(l1l->trx);
+	/* Transceiver might have been powered on before, e.g.
+	 * in case of sending L1CTL_FBSB_REQ due to signal loss. */
+	if (!l1l->trx->powered_up)
+		trx_if_cmd_poweron(l1l->trx);
 
 	/* Start FBSB expire timer */
 	l1l->fbsb_timer.data = l1l;
diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c
index 35ad3c025..ca78349ab 100644
--- a/src/host/trxcon/trx_if.c
+++ b/src/host/trxcon/trx_if.c
@@ -254,6 +254,11 @@ int trx_if_cmd_poweroff(struct trx_instance *trx)
 
 int trx_if_cmd_poweron(struct trx_instance *trx)
 {
+	if (trx->powered_up) {
+		/* FIXME: this should be handled by the FSM, not here! */
+		LOGP(DTRX, LOGL_ERROR, "Suppressing POWERON as we're already powered up\n");
+		return -EAGAIN;
+	}
 	return trx_ctrl_cmd(trx, 1, "POWERON", "");
 }
 
@@ -495,10 +500,14 @@ static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what)
 	}
 
 	/* Trigger state machine */
-	if (!strncmp(tcm->cmd + 4, "POWERON", 7))
+	if (!strncmp(tcm->cmd + 4, "POWERON", 7)) {
+		trx->powered_up = true;
 		osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_ACTIVE, 0, 0);
-	else if (!strncmp(tcm->cmd + 4, "POWEROFF", 8))
+	}
+	else if (!strncmp(tcm->cmd + 4, "POWEROFF", 8)) {
+		trx->powered_up = false;
 		osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_IDLE, 0, 0);
+	}
 	else if (!strncmp(tcm->cmd + 4, "MEASURE", 7))
 		trx_if_measure_rsp_cb(trx, buf + 14);
 	else if (!strncmp(tcm->cmd + 4, "ECHO", 4))
diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h
index 0b3f36f7c..a44600d91 100644
--- a/src/host/trxcon/trx_if.h
+++ b/src/host/trxcon/trx_if.h
@@ -25,7 +25,10 @@ struct trx_instance {
 	struct osmo_timer_list trx_ctrl_timer;
 	struct llist_head trx_ctrl_list;
 	struct osmo_fsm_inst *fsm;
+
+	/* HACK: we need proper state machines */
 	uint32_t prev_state;
+	bool powered_up;
 
 	/* GSM L1 specific */
 	uint16_t pm_band_arfcn_start;