diff --git a/nginx/nginx/sites-available/catch-all.conf b/nginx/nginx/sites-available/catch-all.conf
new file mode 100644
index 0000000..47f07fa
--- /dev/null
+++ b/nginx/nginx/sites-available/catch-all.conf
@@ -0,0 +1,22 @@
+# Catch-all for unmatched subdomains - serves a 404 page.
+server {
+  listen 443 ssl default_server;
+  listen [::]:443 ssl default_server;
+
+  ssl_certificate /etc/letsencrypt/live/nhcarrigan.com/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/nhcarrigan.com/privkey.pem;
+
+  server_name _;
+
+  root /home/naomi/404;
+
+  error_page 404 /index.html;
+
+  location / {
+    return 404;
+  }
+
+  location = /index.html {
+    internal;
+  }
+}
diff --git a/nginx/nginx/sites-available/default b/nginx/nginx/sites-available/default
index 4876607..6a365d8 100644
--- a/nginx/nginx/sites-available/default
+++ b/nginx/nginx/sites-available/default
@@ -2,17 +2,17 @@ server {
 	listen 80 default_server;
 	listen [::]:80 default_server;
 
-	root /var/www/html;
-	index index.html index.htm index.nginx-debian.html;
-
 	server_name _;
 
+	root /home/naomi/404;
+
+	error_page 404 /index.html;
+
 	location / {
-		try_files $uri $uri/ =404;
+		return 404;
 	}
 
-	error_page 500 502 503 504 /50x.html;
-	location = /50x.html {
-		root /usr/share/nginx/html;
+	location = /index.html {
+		internal;
 	}
 }