diff --git a/engine/client/r_part.c b/engine/client/r_part.c
index 20eca41c9..487ca5105 100644
--- a/engine/client/r_part.c
+++ b/engine/client/r_part.c
@@ -416,6 +416,7 @@ void P_ParticleEffect_f(void)
 	skytris_t *st;
 	qboolean settype = false;
 	qboolean setalphadelta = false;
+	qboolean setbeamlen = false;
 
 	part_type_t *ptype;
 	int pnum, assoc;
@@ -527,6 +528,7 @@ void P_ParticleEffect_f(void)
 		else if (!strcmp(var, "beamtexstep"))
 		{
 			ptype->rotationstartmin = 1/atof(value);
+			setbeamlen = true;
 		}
 		else if (!strcmp(var, "beamtexspeed"))
 		{
@@ -974,6 +976,9 @@ void P_ParticleEffect_f(void)
 		}
 	}
 
+	if (ptype->type == PT_BEAM && !setbeamlen)
+		ptype->rotationstartmin = 1/128.0;
+
 	// use old behavior if not using alphadelta
 	if (!setalphadelta)
 		ptype->alphachange = (-ptype->alphachange / ptype->die) * ptype->alpha;