diff --git a/releases/valve/source/mod/AvHServerUtil.cpp b/releases/valve/source/mod/AvHServerUtil.cpp
index ba3385f2..e3e9ab2f 100644
--- a/releases/valve/source/mod/AvHServerUtil.cpp
+++ b/releases/valve/source/mod/AvHServerUtil.cpp
@@ -1375,7 +1375,9 @@ void AvHTraceLine(const Vector& vecStart, const Vector& vecEnd, IGNORE_MONSTERS
 
             edict_t* theEdict = pList[i]->edict();
 
-            if (theEdict != pentIgnore)
+			// tankefugl: 0000941 -- added check to remove testing of spectators
+			if ((!(pList[i]->pev->iuser1 > 0 || pList[i]->pev->flags & FL_SPECTATOR)) && theEdict != pentIgnore)
+			// if (theEdict != pentIgnore)
             {
 
                 float t = NS_TraceLineAgainstEntity(pList[i]->entindex(), gpGlobals->time, theRayOrigin, theRayDirection);