diff --git a/datasette/app.py b/datasette/app.py
index b17517ba..b39458dd 100644
--- a/datasette/app.py
+++ b/datasette/app.py
@@ -1124,9 +1124,7 @@ class DatasetteRouter:
             info = {}
             message = str(exception)
             traceback.print_exc()
-        templates = ["500.html"]
-        if status != 500:
-            templates = ["{}.html".format(status)] + templates
+        templates = ["{}.html".format(status), "error.html"]
         info.update(
             {
                 "ok": False,
diff --git a/datasette/templates/500.html b/datasette/templates/error.html
similarity index 100%
rename from datasette/templates/500.html
rename to datasette/templates/error.html