diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c
index 0bb4ee8fe..b439cdaa2 100644
--- a/engine/client/pr_csqc.c
+++ b/engine/client/pr_csqc.c
@@ -4670,7 +4670,7 @@ static void QCBUILTIN PF_cl_te_lightning1 (pubprogfuncs_t *prinst, struct global
 	float *start = G_VECTOR(OFS_PARM1);
 	float *end = G_VECTOR(OFS_PARM2);
 
-	CL_AddBeam(BT_Q1LIGHTNING1, ent->entnum+MAX_EDICTS, start, end);
+	CL_AddBeam(BT_Q1LIGHTNING1, ent->entnum+(ent->entnum?MAX_EDICTS:0), start, end);
 }
 static void QCBUILTIN PF_cl_te_lightning2 (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
 {
@@ -4678,7 +4678,7 @@ static void QCBUILTIN PF_cl_te_lightning2 (pubprogfuncs_t *prinst, struct global
 	float *start = G_VECTOR(OFS_PARM1);
 	float *end = G_VECTOR(OFS_PARM2);
 
-	CL_AddBeam(BT_Q1LIGHTNING2, ent->entnum+MAX_EDICTS, start, end);
+	CL_AddBeam(BT_Q1LIGHTNING2, ent->entnum+(ent->entnum?MAX_EDICTS:0), start, end);
 }
 static void QCBUILTIN PF_cl_te_lightning3 (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
 {
@@ -4686,7 +4686,7 @@ static void QCBUILTIN PF_cl_te_lightning3 (pubprogfuncs_t *prinst, struct global
 	float *start = G_VECTOR(OFS_PARM1);
 	float *end = G_VECTOR(OFS_PARM2);
 
-	CL_AddBeam(BT_Q1LIGHTNING3, ent->entnum+MAX_EDICTS, start, end);
+	CL_AddBeam(BT_Q1LIGHTNING3, ent->entnum+(ent->entnum?MAX_EDICTS:0), start, end);
 }
 static void QCBUILTIN PF_cl_te_beam (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
 {
@@ -4694,7 +4694,7 @@ static void QCBUILTIN PF_cl_te_beam (pubprogfuncs_t *prinst, struct globalvars_s
 	float *start = G_VECTOR(OFS_PARM1);
 	float *end = G_VECTOR(OFS_PARM2);
 
-	CL_AddBeam(BT_Q1BEAM, ent->entnum+MAX_EDICTS, start, end);
+	CL_AddBeam(BT_Q1BEAM, ent->entnum+(ent->entnum?MAX_EDICTS:0), start, end);
 }
 static void QCBUILTIN PF_cl_te_plasmaburn (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
 {