diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index a2529c99ee0..e01775bedce 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -96,7 +96,6 @@
 	external_type = /obj/item/robot_parts/robot_component/binary_communication_device
 	energy_consumption = 0
 	max_damage = 30
-	component_disabled = 0
 
 /datum/robot_component/camera
 	name = "camera"
@@ -125,10 +124,10 @@
 	var/datum/robot_component/C = components[module_name]
 	return C && C.installed == 1 && C.toggled && C.is_powered() && !C.component_disabled
 
-/mob/living/silicon/robot/proc/disable_component(module_name, emp_duration)
+/mob/living/silicon/robot/proc/disable_component(module_name, duration)
 	 var/datum/robot_component/D = get_component(module_name)
 	 D.component_disabled = 1
-	 spawn (emp_duration)
+	 spawn(duration)
 	 		D.component_disabled = 0
 
 // Returns component by it's string name
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 20e30ffc5c0..07f6dff1609 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1473,7 +1473,8 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/emp_act(severity)
 	..()
-	if(1)
-		disable_component("comms", 360)
-	if(2)
-		disable_component("comms", 60)
+	switch(severity)
+		if(1)
+			disable_component("comms", 160)
+		if(2)
+			disable_component("comms", 60)