diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 26b3d5bb..b4456be1 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -112,8 +112,8 @@ http {
         server_name grapheneos.org;
 
         root /srv/grapheneos.org;
-        error_page 403 =404 /404.html;
-        error_page 404 /404.html;
+        error_page 403 =404 /404;
+        error_page 404 /404;
 
         include snippets/security-headers.conf;
         add_header Cross-Origin-Resource-Policy "same-origin" always;
@@ -215,13 +215,7 @@ http {
             include snippets/security-headers.conf;
             add_header Cross-Origin-Resource-Policy "same-origin" always;
             include snippets/preload.conf;
-        }
-
-        location = /404.html {
-            internal;
-            include snippets/security-headers.conf;
-            add_header Cross-Origin-Resource-Policy "same-origin" always;
-            include snippets/preload.conf;
+            try_files $uri.html =404;
         }
 
         # broken link (now fixed) on https://noagendaphone.com/ with UTF-8 replacement character