diff --git a/code/modules/admin/verbs/modify_robot.dm b/code/modules/admin/verbs/modify_robot.dm
index 540cc26d300..9a5c937028e 100644
--- a/code/modules/admin/verbs/modify_robot.dm
+++ b/code/modules/admin/verbs/modify_robot.dm
@@ -229,7 +229,7 @@
 					var/selected_radio_channel = tgui_input_list(usr, "Please select the radio channel to add", "Channels", available_channels)
 					if(!selected_radio_channel || selected_radio_channel == "Cancel")
 						break
-					if(selected_radio_channel == CHANNEL_SPECIAL_OPS)
+					if(selected_radio_channel == CHANNEL_SPECIAL_OPS || selected_radio_channel == CHANNEL_RESPONSE_TEAM)
 						target.radio.centComm = 1
 					if(selected_radio_channel == CHANNEL_RAIDER)
 						qdel(target.radio.keyslot)
@@ -249,7 +249,7 @@
 					var/selected_radio_channel = tgui_input_list(usr, "Please select the radio channel to remove", "Channels", target.radio.channels)
 					if(!selected_radio_channel || selected_radio_channel == "Cancel")
 						break
-					if(selected_radio_channel == CHANNEL_SPECIAL_OPS)
+					if(selected_radio_channel == CHANNEL_SPECIAL_OPS || selected_radio_channel == CHANNEL_RESPONSE_TEAM && !(target.module.channels[CHANNEL_SPECIAL_OPS] || target.module.channels[CHANNEL_RESPONSE_TEAM]))
 						target.radio.centComm = 0
 					target.module.channels -= selected_radio_channel
 					if((selected_radio_channel == CHANNEL_MERCENARY || selected_radio_channel == CHANNEL_RAIDER) && !(target.module.channels[CHANNEL_RAIDER] || target.module.channels[CHANNEL_MERCENARY]))
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
index 3605dd4b99c..64c70cea717 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -751,6 +751,7 @@ var/global/list/robot_modules = list(
 /obj/item/weapon/robot_module/robot/security/combat
 	name = "combat robot module"
 	hide_on_manifest = TRUE
+	channels = list(CHANNEL_SECURITY = 1, CHANNEL_RESPONSE_TEAM = 1)
 	supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade)
 
 /obj/item/weapon/robot_module/robot/security/combat/create_equipment(var/mob/living/silicon/robot/robot)
@@ -769,6 +770,7 @@ var/global/list/robot_modules = list(
 
 	src.modules += new /obj/item/device/dogborg/sleeper/K9/ert(src)
 	src.modules += new /obj/item/weapon/dogborg/pounce(src)
+	robot.radio.centComm = 1
 
 
 /* Drones */