diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 2c2ca2c..c57de95 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -8,7 +8,6 @@ import Providers from "./provider";
 import Header from "@/components/header";
 import Footer from "@/components/footer";
 import AdminBanner from "@/components/admin/banner";
-import RedirectBanner from "@/components/redirect-banner";
 
 const lexend = Lexend({
 	subsets: ["latin"],
@@ -55,7 +54,6 @@ export default function RootLayout({
 				<Providers>
 					<Header />
 					<AdminBanner />
-					<RedirectBanner />
 					<main className="px-4 py-8 max-w-7xl w-full flex-grow flex flex-col">{children}</main>
 					<Footer />
 				</Providers>
diff --git a/src/components/admin/banner.tsx b/src/components/admin/banner.tsx
index 362ce57..fa9907e 100644
--- a/src/components/admin/banner.tsx
+++ b/src/components/admin/banner.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useSearchParams } from "next/navigation";
 import useSWR from "swr";
 import { Icon } from "@iconify/react";
 
@@ -9,14 +10,23 @@ interface ApiResponse {
 
 const fetcher = (url: string) => fetch(url).then((res) => res.json());
 
+const Banner = ({ icon, message }: { icon: string; message: string }) => (
+	<div className="w-full h-10 bg-orange-300 border-y-2 border-y-orange-400 mt-1 shadow-md flex justify-center items-center gap-2 text-orange-900 text-nowrap overflow-x-auto font-semibold max-sm:justify-start">
+		<Icon icon={icon} className="text-2xl min-w-6" />
+		<span>{message}</span>
+	</div>
+);
+
 export default function AdminBanner() {
+	const searchParams = useSearchParams();
+	const from = searchParams.get("from");
+
 	const { data } = useSWR<ApiResponse>("/api/admin/banner", fetcher);
-	if (!data || !data.message) return null;
 
 	return (
-		<div className="w-full h-10 bg-orange-300 border-y-2 border-y-orange-400 mt-1 shadow-md flex justify-center items-center gap-2 text-orange-900 text-nowrap overflow-x-auto font-semibold max-sm:justify-start">
-			<Icon icon="humbleicons:exclamation" className="text-2xl min-w-6" />
-			<span>{data.message}</span>
-		</div>
+		<>
+			{data && data.message && <Banner icon="humbleicons:exclamation" message={data.message} />}
+			{from == "old-domain" && <Banner icon="humbleicons:link" message="We have moved URLs, welcome to tomodachishare.com!" />}
+		</>
 	);
 }
diff --git a/src/components/redirect-banner.tsx b/src/components/redirect-banner.tsx
deleted file mode 100644
index f7bc552..0000000
--- a/src/components/redirect-banner.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { headers } from "next/headers";
-import { Icon } from "@iconify/react";
-
-export default async function RedirectBanner() {
-	const headersList = await headers();
-	const referer = headersList.get("Referer");
-
-	if (referer !== "https://tomodachi-share.trafficlunar.net") return null;
-
-	return (
-		<div className="w-full h-10 bg-orange-300 border-y-2 border-y-orange-400 mt-1 shadow-md flex justify-center items-center gap-2 text-orange-900 text-nowrap overflow-x-auto font-semibold max-sm:justify-start">
-			<Icon icon="humbleicons:link" className="text-2xl min-w-6" />
-			<span>
-				You&apos;ve been redirected — TomodachiShare is now at <strong>tomodachishare.com</strong>!
-			</span>
-		</div>
-	);
-}