diff --git a/.gitmodules b/.gitmodules
index bd93432..40741b1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "mastodon"]
 	path = mastodon
-	url = https://github.com/mastodon/mastodon.git
+	url = https://github.com/sunoru/mastodon.git
diff --git a/mastodon b/mastodon
index 3f5af76..4633bb8 160000
--- a/mastodon
+++ b/mastodon
@@ -1 +1 @@
-Subproject commit 3f5af768c8f1401f77d14ad5b6aeccdb7e02a9f0
+Subproject commit 4633bb8ce09f216170c3f8370a8e48f3a41872cb
diff --git a/nginx/conf.d/hub.moon.moe.conf b/nginx/conf.d/hub.moon.moe.conf
index 59e0617..b9ed859 100644
--- a/nginx/conf.d/hub.moon.moe.conf
+++ b/nginx/conf.d/hub.moon.moe.conf
@@ -38,6 +38,12 @@ server {
         try_files $uri @proxy;
     }
 
+    location /api/v2/media {
+        proxy_read_timeout 500;
+        client_max_body_size 2g;
+        try_files $uri @proxy;
+    }
+
     location = /sw.js {
         add_header Cache-Control "public, max-age=604800, must-revalidate";
         add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";