diff --git a/src/components/Error.tsx b/src/components/Error.tsx
index 8e1561f7..1dcafbc6 100644
--- a/src/components/Error.tsx
+++ b/src/components/Error.tsx
@@ -1,38 +1,45 @@
-import { AlertCircle } from "@untitled-ui/icons-react";
+import { LinkExternal02 } from "@untitled-ui/icons-react";
 // eslint-disable-next-line import/no-restricted-paths
 import { Header } from "../features/header/components/header";
-import { Card } from "@stacklok/ui-kit";
+import { PageContainer } from "./page-container";
+import { EmptyState } from "./empty-state";
+import { IllustrationAlert, LinkButton } from "@stacklok/ui-kit";
+import { emptyStateStrings } from "@/constants/empty-state-strings";
+import { hrefs } from "@/lib/hrefs";
 
 export function ErrorFallbackContent() {
   return (
-    <div className="h-24 flex flex-col flex-1 justify-center">
-      <Card className="p-8 flex flex-col items-center">
-        <AlertCircle className="text-red-600 mb-2 size-16" />
-        <div className="text-xl font-semibold text-secondary text-center">
-          An error occurred
-        </div>
-        <div className="text-base mb-4 text-secondary text-center text-balance">
-          If this issue persists, please reach out to us on{" "}
-          <a
-            className="underline text-secondary"
-            href="https://discord.gg/stacklok"
-            rel="noopener noreferrer"
-            target="_blank"
-          >
-            Discord
-          </a>{" "}
-          or open a new{" "}
-          <a
-            className="underline text-secondary"
-            href="https://github.com/stacklok/codegate/issues/new"
-            rel="noopener noreferrer"
-            target="_blank"
-          >
-            Github issue
-          </a>
-        </div>
-      </Card>
-    </div>
+    <PageContainer>
+      <div className="py-20 flex flex-col items-center">
+        <EmptyState
+          title={emptyStateStrings.title.anErrorOccurred}
+          body={emptyStateStrings.body.errorDesc}
+          illustration={IllustrationAlert}
+          actions={[
+            <LinkButton
+              key="discord"
+              variant="secondary"
+              href={hrefs.external.discord}
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              Discord
+              <LinkExternal02 />
+            </LinkButton>,
+            <LinkButton
+              key="github-issues"
+              variant="secondary"
+              href={hrefs.external.github.newIssue}
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              Github issues
+              <LinkExternal02 />
+            </LinkButton>,
+          ]}
+        />
+      </div>
+    </PageContainer>
   );
 }
 
diff --git a/src/features/dashboard-messages/constants/strings.ts b/src/constants/empty-state-strings.ts
similarity index 100%
rename from src/features/dashboard-messages/constants/strings.ts
rename to src/constants/empty-state-strings.ts
diff --git a/src/features/dashboard-messages/components/__tests__/table-messages.empty-state.test.tsx b/src/features/dashboard-messages/components/__tests__/table-messages.empty-state.test.tsx
index 27b7d0c2..5269e7e1 100644
--- a/src/features/dashboard-messages/components/__tests__/table-messages.empty-state.test.tsx
+++ b/src/features/dashboard-messages/components/__tests__/table-messages.empty-state.test.tsx
@@ -1,7 +1,7 @@
 import { test } from "vitest";
 import { render, waitFor } from "@/lib/test-utils";
 import { server } from "@/mocks/msw/node";
-import { emptyStateStrings } from "../../constants/strings";
+import { emptyStateStrings } from "../../../../constants/empty-state-strings";
 import { useSearchParams } from "react-router-dom";
 import { delay, http, HttpHandler, HttpResponse } from "msw";
 import { mockAlert } from "../../../../mocks/msw/mockers/alert.mock";
diff --git a/src/features/dashboard-messages/components/section-conversation-secrets.tsx b/src/features/dashboard-messages/components/section-conversation-secrets.tsx
index 576a3ed3..fd7e3149 100644
--- a/src/features/dashboard-messages/components/section-conversation-secrets.tsx
+++ b/src/features/dashboard-messages/components/section-conversation-secrets.tsx
@@ -2,7 +2,7 @@ import { IllustrationDone } from "@stacklok/ui-kit";
 import { isAlertSecret } from "@/lib/is-alert-secret";
 import { ConversationSecretsDetected } from "./conversation-secrets-detected";
 import { EmptyState } from "@/components/empty-state";
-import { emptyStateStrings } from "../constants/strings";
+import { emptyStateStrings } from "../../../constants/empty-state-strings";
 import { Conversation } from "@/api/generated";
 
 export function SectionConversationSecrets({
diff --git a/src/features/dashboard-messages/components/table-messages-empty-state.tsx b/src/features/dashboard-messages/components/table-messages-empty-state.tsx
index 0461b54b..8e6e358a 100644
--- a/src/features/dashboard-messages/components/table-messages-empty-state.tsx
+++ b/src/features/dashboard-messages/components/table-messages-empty-state.tsx
@@ -9,7 +9,7 @@ import {
 } from "@stacklok/ui-kit";
 import { ReactNode } from "react";
 
-import { emptyStateStrings } from "../constants/strings";
+import { emptyStateStrings } from "../../../constants/empty-state-strings";
 import { EmptyState } from "@/components/empty-state";
 import { hrefs } from "@/lib/hrefs";
 import { LinkExternal02 } from "@untitled-ui/icons-react";