diff --git a/website/src/components/EmptyState.tsx b/website/src/components/EmptyState.tsx
index 825dc610..f6245204 100644
--- a/website/src/components/EmptyState.tsx
+++ b/website/src/components/EmptyState.tsx
@@ -1,6 +1,5 @@
 import { Box, Link, Text, useColorModeValue } from "@chakra-ui/react";
 import { useRouter } from "next/router";
-import { FiAlertTriangle } from "react-icons/fi";
 import { IconType } from "react-icons/lib";
 
 type EmptyStateProps = {
@@ -24,17 +23,3 @@ export const EmptyState = (props: EmptyStateProps) => {
     </Box>
   );
 };
-
-export const TaskEmptyState = () => {
-  return <EmptyState text="Looks like no tasks were found." icon={FiAlertTriangle} />;
-};
-
-export const PageEmptyState = () => {
-  return <EmptyState text="Sorry, the page you are looking for does not exist." icon={FiAlertTriangle} />;
-};
-
-export const ServerEmptyState = () => {
-  return (
-    <EmptyState text="Sorry, we encountered a server error. We're not sure what went wrong." icon={FiAlertTriangle} />
-  );
-};
diff --git a/website/src/pages/404.tsx b/website/src/pages/404.tsx
index f4c09bbf..afe1d080 100644
--- a/website/src/pages/404.tsx
+++ b/website/src/pages/404.tsx
@@ -1,8 +1,7 @@
-import { Box, Button, Center, Link, Text, useColorModeValue } from "@chakra-ui/react";
+import { Box, Button, Center, Link, Text } from "@chakra-ui/react";
 import Head from "next/head";
-import { useRouter } from "next/router";
 import { FiAlertTriangle } from "react-icons/fi";
-import { PageEmptyState } from "src/components/EmptyState";
+import { EmptyState } from "src/components/EmptyState";
 import { getTransparentHeaderLayout } from "src/components/Layout";
 
 function Error() {
@@ -13,7 +12,7 @@ function Error() {
         <meta name="404" content="Sorry, this page doesn't exist." />
       </Head>
       <Center flexDirection="column" gap="4" fontSize="lg" className="subpixel-antialiased">
-        <PageEmptyState />
+        <EmptyState text="Sorry, the page you are looking for does not exist." icon={FiAlertTriangle} />
         <Box display="flex" flexDirection="column" alignItems="center" gap="2" mt="6">
           <Text fontSize="sm">If you were trying to contribute data but ended up here, please file a bug.</Text>
           <Button
diff --git a/website/src/pages/500.tsx b/website/src/pages/500.tsx
index ebbcee67..49eb2950 100644
--- a/website/src/pages/500.tsx
+++ b/website/src/pages/500.tsx
@@ -1,10 +1,10 @@
-import { Button, Box, Text, Center, Link, Stack } from "@chakra-ui/react";
+import { Box, Button, Center, Link, Text } from "@chakra-ui/react";
 import Head from "next/head";
-import NextLink from "next/link";
 import { FiAlertTriangle } from "react-icons/fi";
-import { ServerEmptyState } from "src/components/EmptyState";
+import { EmptyState } from "src/components/EmptyState";
+import { getTransparentHeaderLayout } from "src/components/Layout";
 
-export default function Error() {
+function ServerError() {
   return (
     <>
       <Head>
@@ -12,7 +12,10 @@ export default function Error() {
         <meta name="404" content="Sorry, this page doesn't exist." />
       </Head>
       <Center flexDirection="column" gap="4" fontSize="lg" className="subpixel-antialiased">
-        <ServerEmptyState />
+        <EmptyState
+          text="Sorry, we encountered a server error. We're not sure what went wrong."
+          icon={FiAlertTriangle}
+        />
         <Box display="flex" flexDirection="column" alignItems="center" gap="2" mt="6">
           <Text fontSize="sm">If you were trying to contribute data but ended up here, please file a bug.</Text>
           <Button
@@ -37,3 +40,7 @@ export default function Error() {
     </>
   );
 }
+
+ServerError.getLayout = getTransparentHeaderLayout;
+
+export default ServerError;
diff --git a/website/src/pages/tasks/random.tsx b/website/src/pages/tasks/random.tsx
index d2e850f5..55310cfc 100644
--- a/website/src/pages/tasks/random.tsx
+++ b/website/src/pages/tasks/random.tsx
@@ -1,5 +1,6 @@
 import Head from "next/head";
-import { TaskEmptyState } from "src/components/EmptyState";
+import { FiAlertTriangle } from "react-icons/fi";
+import { EmptyState } from "src/components/EmptyState";
 import { getDashboardLayout } from "src/components/Layout";
 import { LoadingScreen } from "src/components/Loading/LoadingScreen";
 import { Task } from "src/components/Tasks/Task";
@@ -13,7 +14,7 @@ const RandomTask = () => {
   }
 
   if (tasks.length === 0) {
-    return <TaskEmptyState />;
+    return <EmptyState text="Looks like no tasks were found." icon={FiAlertTriangle} />;
   }
 
   return (
