diff --git a/engine/server/world.c b/engine/server/world.c
index 25d42dadc..bf782cb3e 100644
--- a/engine/server/world.c
+++ b/engine/server/world.c
@@ -905,7 +905,7 @@ wedict_t	*World_TestEntityPosition (world_t *w, wedict_t *ent)
 {
 	trace_t	trace;
 
-	trace = World_Move (w, ent->v->origin, ent->v->mins, ent->v->maxs, ent->v->origin, 0, ent);
+	trace = World_Move (w, ent->v->origin, ent->v->mins, ent->v->maxs, ent->v->origin, ((ent->v->solid == SOLID_NOT || ent->v->solid == SOLID_TRIGGER)?MOVE_NOMONSTERS:0), ent);
 	
 	if (trace.startsolid)
 		return w->edicts;
@@ -1139,12 +1139,6 @@ static trace_t World_ClipMoveToEntity (world_t *w, wedict_t *ent, vec3_t eorg, v
 				TransformedTrace(model, hullnum, ent->v->frame, start, end, mins, maxs, &trace, eorg, ent->v->angles);
 			}
 		}
-
-		if (trace.startsolid)
-		{
-			if (ent != w->edicts)
-				Con_Printf("Trace started solid\n");
-		}
 	}
 
 // did we clip the move?