diff --git a/dist/nginx.conf b/dist/nginx.conf
index 3ab9bb66a2..8d06c4850c 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -52,6 +52,7 @@ server {
   keepalive_timeout    70;
   sendfile             on;
   client_max_body_size 99m;
+  proxy_read_timeout 120; ## Increase if you experience 504 errors uploading media
 
   root /home/mastodon/live/public;