diff --git a/code/datums/components/status_effect_component.dm b/code/datums/components/status_effect_component.dm
index 098c2a7b0eb0..34c077f61935 100644
--- a/code/datums/components/status_effect_component.dm
+++ b/code/datums/components/status_effect_component.dm
@@ -2,11 +2,11 @@
 
 /datum/component/status_effect
 	var/has_immunity = FALSE
-	var/grace_period = 5
+	var/grace_period = 30
 
 /datum/component/status_effect/InheritComponent(datum/component/C, i_am_original)
 	if(has_immunity)
-		grace_period = initial(grace_period)
+		grace_period = min(grace_period + 1, initial(grace_period))
 
 /datum/component/status_effect/Initialize()
 	. = ..()