diff --git a/engine/server/world.c b/engine/server/world.c
index 3565a6a5b..1b6ce1cb1 100644
--- a/engine/server/world.c
+++ b/engine/server/world.c
@@ -493,7 +493,7 @@ void World_LinkEdict (world_t *w, wedict_t *ent, qboolean touch_triggers)
 	InsertLinkBefore (&ent->area, &node->edicts);
 	
 // if touch_triggers, touch all entities at this node and decend for more
-	if (touch_triggers)
+	if (touch_triggers && ent->v->solid != SOLID_NOT)
 		World_TouchLinks (w, ent, w->areanodes);
 }