diff --git a/src/app/(auth)/authorize/page.tsx b/src/app/(auth)/authorize/page.tsx
index 0c2ef71..f2e2a48 100644
--- a/src/app/(auth)/authorize/page.tsx
+++ b/src/app/(auth)/authorize/page.tsx
@@ -1,9 +1,6 @@
 "use client";
 
-import { useEffect } from "react";
 import Link from "next/link";
-import { useRouter } from "next/navigation";
-import Cookies from "js-cookie";
 import { MessageCircleCode } from "lucide-react";
 
 import { UserAuthorize } from "@/components/auth/user-authorize";
@@ -13,28 +10,6 @@ type Props = {
 };
 
 export default function AuthPage({ searchParams }: Props) {
-  const router = useRouter();
-
-  useEffect(() => {
-    // 检查是否有 OAuth 状态参数
-    const oauthState = Cookies.get("oauth_state");
-    if (oauthState) {
-      try {
-        // 解码 OAuth 参数
-        const params = JSON.parse(atob(oauthState));
-        // 删除 cookie
-        fetch("/api/auth/oauth-state", { method: "DELETE" }).catch(
-          console.error,
-        );
-        // 构建重定向 URL
-        const searchParams = new URLSearchParams(params);
-        router.push(`/oauth/authorize?${searchParams.toString()}`);
-      } catch (error) {
-        console.error("Failed to process OAuth state:", error);
-      }
-    }
-  }, [router]);
-
   return (
     <div className="mx-auto flex w-full flex-col justify-center space-y-6 sm:w-[350px]">
       <div className="flex flex-col space-y-2 text-center">
diff --git a/src/app/(auth)/sign-in/page.tsx b/src/app/(auth)/sign-in/page.tsx
index 66b45be..f54f905 100644
--- a/src/app/(auth)/sign-in/page.tsx
+++ b/src/app/(auth)/sign-in/page.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { useEffect } from "react";
 import Link from "next/link";
 import { ChevronLeft, MessageCircleCode } from "lucide-react";
 
@@ -8,24 +7,7 @@ import { cn } from "@/lib/utils";
 import { buttonVariants } from "@/components/ui/button";
 import { UserAuthForm } from "@/components/auth/user-auth-form";
 
-interface Props {
-  searchParams: { state?: string };
-}
-
-export default function LoginPage({ searchParams }: Props) {
-  useEffect(() => {
-    // 如果有 state 参数，保存到 cookie
-    if (searchParams.state) {
-      fetch("/api/auth/oauth-state", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ state: searchParams.state }),
-      }).catch(console.error);
-    }
-  }, [searchParams.state]);
-
+export default function LoginPage() {
   return (
     <>
       <Link
@@ -48,7 +30,7 @@ export default function LoginPage({ searchParams }: Props) {
             <span style={{ fontFamily: "Bahamas Bold" }}>Q58 Connect</span>
           </div>
         </div>
-        <UserAuthForm oauthState={searchParams.state} />
+        <UserAuthForm />
         <p className="px-8 text-center text-sm text-muted-foreground">
           By clicking continue, you agree to our{" "}
           <Link
diff --git a/src/app/(oauth)/oauth/authorize/page.tsx b/src/app/(oauth)/oauth/authorize/page.tsx
index dbe99b9..6c42252 100644
--- a/src/app/(oauth)/oauth/authorize/page.tsx
+++ b/src/app/(oauth)/oauth/authorize/page.tsx
@@ -21,10 +21,7 @@ export default async function OAuthAuthorization({
   // 检查用户是否已登录
   const user = await getCurrentUser();
   if (!user?.id) {
-    // 将 OAuth 参数编码为 base64
-    const encodedParams = btoa(JSON.stringify(searchParams));
-    // 重定向到登录页面，将 OAuth 参数作为查询参数传递
-    redirect(`/sign-in?state=${encodedParams}`);
+    redirect("/sign-in");
   }
 
   // 验证必要的参数
diff --git a/src/app/api/auth/oauth-state/route.ts b/src/app/api/auth/oauth-state/route.ts
deleted file mode 100644
index 58a047b..0000000
--- a/src/app/api/auth/oauth-state/route.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { cookies } from "next/headers";
-import { NextResponse } from "next/server";
-
-export async function POST(req: Request) {
-  try {
-    const { state } = await req.json();
-    cookies().set("oauth_state", state, {
-      maxAge: 60 * 10, // 10分钟过期
-      path: "/",
-      httpOnly: true,
-      secure: process.env.NODE_ENV === "production",
-    });
-    return NextResponse.json({ success: true });
-  } catch (error) {
-    return NextResponse.json(
-      { error: "Failed to save state" },
-      { status: 500 },
-    );
-  }
-}
-
-export async function DELETE() {
-  cookies().delete("oauth_state");
-  return NextResponse.json({ success: true });
-}
diff --git a/src/app/api/auth/q58/route.ts b/src/app/api/auth/q58/route.ts
index 7497157..07eb483 100644
--- a/src/app/api/auth/q58/route.ts
+++ b/src/app/api/auth/q58/route.ts
@@ -11,22 +11,7 @@ const clientSecret = process.env.DISCOURSE_SECRET as string;
 
 export async function POST(_req: Request) {
   const nonce = WordArray.random(16).toString();
-
-  // 检查是否存在 OAuth 状态
-  const oauthState = cookies().get("oauth_state");
-  let return_url = `${hostUrl}/dashboard`; // 默认重定向到仪表板
-
-  if (oauthState) {
-    try {
-      // 解码并重建 OAuth URL
-      const params = JSON.parse(atob(oauthState.value));
-      const searchParams = new URLSearchParams(params);
-      return_url = `${hostUrl}/oauth/authorize?${searchParams.toString()}`;
-    } catch (error) {
-      console.error("Failed to process OAuth state:", error);
-    }
-  }
-
+  const return_url = `${hostUrl}/authorize`;
   const sso = btoa(`nonce=${nonce}&return_sso_url=${return_url}`);
   const sig = hmacSHA256(sso, clientSecret).toString(Hex);
 
diff --git a/src/components/auth/user-auth-form.tsx b/src/components/auth/user-auth-form.tsx
index 4a6770f..ddbcec0 100644
--- a/src/components/auth/user-auth-form.tsx
+++ b/src/components/auth/user-auth-form.tsx
@@ -12,15 +12,10 @@ interface DiscourseData {
   sso_url: string;
 }
 
-interface UserAuthFormProps extends React.HTMLAttributes<HTMLDivElement> {
-  oauthState?: string;
-}
-
 export function UserAuthForm({
   className,
-  oauthState,
   ...props
-}: UserAuthFormProps) {
+}: React.HTMLAttributes<HTMLDivElement>) {
   const [isLoading, setIsLoading] = React.useState<boolean>(false);
   const router = useRouter();
   const { toast } = useToast();
@@ -28,17 +23,6 @@ export function UserAuthForm({
   const signIn = () => {
     React.startTransition(async () => {
       try {
-        // 如果有 OAuth 参数，先保存到 cookie
-        if (oauthState) {
-          await fetch("/api/auth/oauth-state", {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify({ state: oauthState }),
-          });
-        }
-
         const response = await fetch("/api/auth/q58", {
           method: "POST",
           headers: {