diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index eca88d5126..3a2ca82bcd 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -357,6 +357,9 @@ SUBSYSTEM_DEF(timer)
 
 	wait = max(wait, 0)
 
+	if(wait >= INFINITY)
+		CRASH("Attempted to create timer with INFINITY delay")
+
 	var/hash
 
 	if (flags & TIMER_UNIQUE)
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index 252a305af2..c1a75c8b7e 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -29,7 +29,8 @@
 	icon = beam_icon
 	icon_state = beam_icon_state
 	beam_type = btype
-	addtimer(CALLBACK(src,.proc/End), time)
+	if(time < INFINITY)
+		addtimer(CALLBACK(src,.proc/End), time)
 
 /datum/beam/proc/Start()
 	Draw()