1diff --git a/webui/src/App.tsx b/webui/src/App.tsx
 2index 3e8f71e..4fd0993 100644
 3--- a/webui/src/App.tsx
 4+++ b/webui/src/App.tsx
 5@@ -11,7 +11,6 @@ export default function App() {
 6     <Layout>
 7       <Switch>
 8         <Route path="/" exact component={ListPage} />
 9-        <Route path="/404bug" exact component={NotFoundPage} />
10         <Route path="/bug/:id" exact component={BugPage} />
11         <Route component={NotFoundPage} />
12       </Switch>
13diff --git a/webui/src/pages/bug/BugQuery.tsx b/webui/src/pages/bug/BugQuery.tsx
14index ade64e9..5d459c4 100644
15--- a/webui/src/pages/bug/BugQuery.tsx
16+++ b/webui/src/pages/bug/BugQuery.tsx
17@@ -1,8 +1,10 @@
18 import React from 'react';
19-import { Redirect, RouteComponentProps } from 'react-router-dom';
20+import { RouteComponentProps } from 'react-router-dom';
21 
22 import CircularProgress from '@material-ui/core/CircularProgress';
23 
24+import NotFoundPage from '../notfound/NotFoundPage';
25+
26 import Bug from './Bug';
27 import { useGetBugQuery } from './BugQuery.generated';
28 
29@@ -15,7 +17,7 @@ const BugQuery: React.FC<Props> = ({ match }: Props) => {
30     variables: { id: match.params.id },
31   });
32   if (loading) return <CircularProgress />;
33-  if (!data?.repository?.bug) return <Redirect to="/404bug" />;
34+  if (!data?.repository?.bug) return <NotFoundPage />;
35   if (error) return <p>Error: {error}</p>;
36   return <Bug bug={data.repository.bug} />;
37 };