diff --git a/thoughts-frontend/app/settings/federation/page.tsx b/thoughts-frontend/app/settings/federation/page.tsx
new file mode 100644
index 0000000..0d03082
--- /dev/null
+++ b/thoughts-frontend/app/settings/federation/page.tsx
@@ -0,0 +1,23 @@
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
+import { FederationPanel } from "@/components/federation/federation-panel";
+
+export default async function FederationSettingsPage() {
+  const token = (await cookies()).get("auth_token")?.value;
+  if (!token) {
+    redirect("/login");
+  }
+
+  return (
+    <div className="space-y-6">
+      <div className="glass-effect glossy-effect bottom rounded-md shadow-fa-lg p-4">
+        <h3 className="text-lg font-medium">Federation</h3>
+        <p className="text-sm text-muted-foreground">
+          Manage remote follow requests, followers, and accounts you follow on
+          other instances.
+        </p>
+      </div>
+      <FederationPanel />
+    </div>
+  );
+}
diff --git a/thoughts-frontend/app/settings/layout.tsx b/thoughts-frontend/app/settings/layout.tsx
index 7054ce5..d7711ab 100644
--- a/thoughts-frontend/app/settings/layout.tsx
+++ b/thoughts-frontend/app/settings/layout.tsx
@@ -11,6 +11,10 @@ const sidebarNavItems = [
     title: "API Keys",
     href: "/settings/api-keys",
   },
+  {
+    title: "Federation",
+    href: "/settings/federation",
+  },
 ];
 
 export default function SettingsLayout({