diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 87ded568b23..afdfd633bac 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -124,13 +124,19 @@
 		return
 	if(!radio_controller)
 		addtimer(CALLBACK(src, PROC_REF(radio_checkup), new_frequency), 2 SECONDS)
-
+		return
+	set_radio(new_frequency)
 
 /obj/item/assembly/signaler/proc/radio_checkup(new_frequency)
 	PROTECTED_PROC(TRUE)
 	if(!radio_controller)
 		return
+	set_radio(new_frequency)
 
+
+/obj/item/assembly/signaler/proc/set_radio(new_frequency)
+	PROTECTED_PROC(TRUE)
+	SHOULD_NOT_OVERRIDE(TRUE)
 	radio_controller.remove_object(src, frequency)
 	frequency = new_frequency
 	radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)