diff --git a/files/routes/static.py b/files/routes/static.py
index a5a364a7e..c586d9c0c 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -282,7 +282,7 @@ def submit_contact(v):
 	new_comment.top_comment_id = new_comment.id
 
 	admin_ids = [x[0] for x in g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL']).all()]
-	if SITE == 'watchpeopledie.tv':
+	if SITE == 'watchpeopledie.tv' and AEVANN_ID in admin_ids:
 		admin_ids.remove(AEVANN_ID)
 
 	for admin_id in admin_ids:
diff --git a/files/routes/users.py b/files/routes/users.py
index c3c4799a9..a4652e275 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -666,7 +666,7 @@ def messagereply(v:User):
 
 	if top_comment.sentto == MODMAIL_ID:
 		admin_ids = [x[0] for x in g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id).all()]
-		if SITE == 'watchpeopledie.tv':
+		if SITE == 'watchpeopledie.tv' and AEVANN_ID in admin_ids:
 			admin_ids.remove(AEVANN_ID)
 
 		if parent.author.id not in admin_ids + [v.id]: