diff --git a/code/game/g_trigger.c b/code/game/g_trigger.c
index 5a9538c3..94de3fbf 100644
--- a/code/game/g_trigger.c
+++ b/code/game/g_trigger.c
@@ -392,12 +392,13 @@ void SP_trigger_hurt( gentity_t *self ) {
 
 	self->r.contents = CONTENTS_TRIGGER;
 
-	if ( self->spawnflags & 2 ) {
-		self->use = hurt_use;
-	}
+	self->use = hurt_use;
 
 	// link in to the world if starting active
-	if ( ! (self->spawnflags & 1) ) {
+	if ( self->spawnflags & 1 ) {
+		trap_UnlinkEntity (self);
+	}
+	else {
 		trap_LinkEntity (self);
 	}
 }