diff --git a/rtl837x_stp.c b/rtl837x_stp.c
index d870af5..40e5bd4 100644
--- a/rtl837x_stp.c
+++ b/rtl837x_stp.c
@@ -276,10 +276,6 @@ static void stp_loop_hold_peer(uint8_t port) __reentrant
 		print_string("STP: loop detected, blocking port ");
 		print_port_nl(port);
 		stp_state_set(port, 0b01);
-		if (stp_failsafe_s && !stp_failsafe_armed) {
-			stp_failsafe_armed = 1;
-			stp_failsafe_cnt = stp_failsafe_s;
-		}
 		stp_pflags[port] &= ~STP_PF_OPEREDGE;
 		stp_topology_change(port);
 	}
@@ -536,10 +532,6 @@ void stp_in(void) __banked
 			print_string("STP: root guard blocking port ");
 			print_port_nl(port);
 			stp_state_set(port, 0b01);
-			if (stp_failsafe_s && !stp_failsafe_armed) {
-				stp_failsafe_armed = 1;
-				stp_failsafe_cnt = stp_failsafe_s;
-			}
 			port_timers[port] = (uint16_t)stp_fwddelay_s * STP_HZ;
 			stp_pflags[port] &= ~STP_PF_OPEREDGE;
 			return;
diff --git a/rtlplayground.c b/rtlplayground.c
index 3b2d6b5..b24f8f5 100644
--- a/rtlplayground.c
+++ b/rtlplayground.c
@@ -123,7 +123,6 @@ __xdata uint8_t tx_seq;
 __xdata uint8_t stpEnabled;
 __xdata uint8_t igmpEnabled;
 extern __xdata uint8_t stp_failsafe_armed;
-__xdata uint8_t fs_was_armed;
 __xdata char hostname[24];	/* device hostname, default set at boot, see rtl837x_common.h */
 
 __code uint16_t bit_mask[16] = {
@@ -1520,14 +1519,9 @@ void idle(void)
 	// Check whether a command is waiting in the cmd_buffer and execute
 	if (cmd_available) {
 		cmd_available = 0;
-		fs_was_armed = stp_failsafe_armed;
 		cmd_tokenize();
 		if (err_status == ERR_OK)
 			cmd_parser();
-		if (fs_was_armed && stp_failsafe_armed) {
-			stp_failsafe_armed = 0;
-			print_string("STP failsafe: console activity - disarmed\n");
-		}
 		print_cmd_prompt();
 	}
 }