diff --git a/r2/r2/controllers/wiki.py b/r2/r2/controllers/wiki.py
index 105d739da..1cce2b83f 100644
--- a/r2/r2/controllers/wiki.py
+++ b/r2/r2/controllers/wiki.py
@@ -107,7 +107,9 @@ class WikiController(RedditController):
         if not page:
             if c.render_style in extensions.API_TYPES:
                 self.handle_error(404, 'PAGE_NOT_CREATED')
-            return WikiNotFound(page=page_name).render()
+            errorpage = WikiNotFound(page=page_name)
+            request.environ['usable_error_content'] = errorpage.render()
+            self.abort404()
 
         if version:
             edit_by = version.get_author()