diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c
index 3f57b472..3eb70273 100644
--- a/Quake/gl_rmain.c
+++ b/Quake/gl_rmain.c
@@ -733,8 +733,8 @@ void R_ShowBoundingBoxes (void)
 
 	for (i=1, ed=NEXT_EDICT(sv.edicts) ; i<sv.num_edicts ; i++, ed=NEXT_EDICT(ed))
 	{
-		if (ed == sv_player)
-			continue; //don't draw player's own bbox
+		if (ed == sv_player || ed->free)
+			continue; //don't draw player's own bbox or freed edicts
 
 //		if (r_showbboxes.value != 2)
 //			if (!SV_VisibleToClient (sv_player, ed, sv.worldmodel))