diff --git a/nq/source/cl_tent.c b/nq/source/cl_tent.c
index d22fd2543..0d6a9c242 100644
--- a/nq/source/cl_tent.c
+++ b/nq/source/cl_tent.c
@@ -465,7 +465,10 @@ CL_UpdateBeams (void)
 
 	// update lightning
 	for (i = 0, b = cl_beams; i < MAX_BEAMS; i++, b++) {
+		if (!b->endtime)
+			continue;
 		if (!b->model || b->endtime < cl.time) {
+			b->endtime = 0;
 			beam_clear (b);
 			continue;
 		}
diff --git a/qw/source/cl_tent.c b/qw/source/cl_tent.c
index ace3bf8a1..768b31a79 100644
--- a/qw/source/cl_tent.c
+++ b/qw/source/cl_tent.c
@@ -479,7 +479,10 @@ CL_UpdateBeams (void)
 
 	// update lightning
 	for (i = 0, b = cl_beams; i < MAX_BEAMS; i++, b++) {
+		if (!b->endtime)
+			continue;
 		if (!b->model || b->endtime < cl.time) {
+			b->endtime = 0;
 			beam_clear (b);
 			continue;
 		}