diff --git a/nginx/www.conf b/nginx/www.conf
index b062b67..eede5db 100644
--- a/nginx/www.conf
+++ b/nginx/www.conf
@@ -37,6 +37,11 @@ server {
 		return 302 https://${KEYCLOAK_HOSTNAME}.${DOMAIN_NAME}$request_uri;
 	}
 
+	# redirect mastodon handles (which start with @) directly to mastodon site
+	location ~ ^/@ {
+		return 302 https://${MASTODON_HOSTNAME}.${DOMAIN_NAME}$request_uri;
+	}
+
 	# tilde club home directories
 	location ~ ^/~(.+?)(/.*)?$ {
 		alias /home/$1/public_html$2;