diff --git a/app/(main)/ClientComponents/detail/ServerIPInfo.tsx b/app/(main)/ClientComponents/detail/ServerIPInfo.tsx
index c2ff3e1..1543e1d 100644
--- a/app/(main)/ClientComponents/detail/ServerIPInfo.tsx
+++ b/app/(main)/ClientComponents/detail/ServerIPInfo.tsx
@@ -23,7 +23,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
   return (
     <>
       <section className="flex flex-wrap gap-2 mb-4">
-        {data.asn.autonomous_system_organization && (
+        {data.asn?.autonomous_system_organization && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
@@ -33,7 +33,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
             </CardContent>
           </Card>
         )}
-        {data.asn.autonomous_system_number && (
+        {data.asn?.autonomous_system_number && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
@@ -43,7 +43,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
             </CardContent>
           </Card>
         )}
-        {data.city.registered_country?.names.en && (
+        {data.city?.registered_country?.names.en && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
@@ -53,7 +53,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
             </CardContent>
           </Card>
         )}
-        {data.city.country?.iso_code && (
+        {data.city?.country?.iso_code && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
@@ -63,7 +63,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
             </CardContent>
           </Card>
         )}
-        {data.city.city?.names.en && (
+        {data.city?.city?.names.en && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
@@ -73,7 +73,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
             </CardContent>
           </Card>
         )}
-        {data.city.location?.longitude && (
+        {data.city?.location?.longitude && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
@@ -83,7 +83,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
             </CardContent>
           </Card>
         )}
-        {data.city.location?.latitude && (
+        {data.city?.location?.latitude && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
@@ -93,7 +93,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
             </CardContent>
           </Card>
         )}
-        {data.city.location?.time_zone && (
+        {data.city?.location?.time_zone && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
@@ -103,7 +103,7 @@ export default function ServerIPInfo({ server_id }: { server_id: number }) {
             </CardContent>
           </Card>
         )}
-        {data.city.postal && (
+        {data.city?.postal && (
           <Card className="rounded-[10px] bg-transparent border-none shadow-none">
             <CardContent className="px-1.5 py-1">
               <section className="flex flex-col items-start gap-0.5">
diff --git a/components/ServerCard.tsx b/components/ServerCard.tsx
index 41bd1c9..8f2b376 100644
--- a/components/ServerCard.tsx
+++ b/components/ServerCard.tsx
@@ -130,34 +130,41 @@ export default function ServerCard({ serverInfo }: { serverInfo: NezhaAPISafe })
       </Card>
     </Link>
   ) : (
-    <Card
-      className={cn(
-        "flex flex-col items-center justify-start gap-3 p-3 md:px-5",
-        showNetTransfer ? "lg:min-h-[91px] min-h-[123px]" : "lg:min-h-[61px] min-h-[93px]",
-        {
-          "flex-col": fixedTopServerName,
-          "lg:flex-row": !fixedTopServerName,
-        },
-      )}
-    >
-      <section
-        className={cn("grid items-center gap-2", {
-          "lg:w-40": !fixedTopServerName,
-        })}
-        style={{ gridTemplateColumns: "auto auto 1fr" }}
+    <Link onClick={saveSession} href={`/server/${id}`} prefetch={true}>
+      <Card
+        className={cn(
+          "flex flex-col items-center justify-start gap-3 p-3 md:px-5 cursor-pointer hover:bg-accent/50 transition-colors",
+          showNetTransfer ? "lg:min-h-[91px] min-h-[123px]" : "lg:min-h-[61px] min-h-[93px]",
+          {
+            "flex-col": fixedTopServerName,
+            "lg:flex-row": !fixedTopServerName,
+          },
+        )}
       >
-        <span className="h-2 w-2 shrink-0 rounded-full bg-red-500 self-center"></span>
-        <div
-          className={cn("flex items-center justify-center", showFlag ? "min-w-[17px]" : "min-w-0")}
+        <section
+          className={cn("grid items-center gap-2", {
+            "lg:w-40": !fixedTopServerName,
+          })}
+          style={{ gridTemplateColumns: "auto auto 1fr" }}
         >
-          {showFlag ? <ServerFlag country_code={country_code} /> : null}
-        </div>
-        <div className="relative">
-          <p className={cn("break-all font-bold tracking-tight", showFlag ? "text-xs" : "text-sm")}>
-            {name}
-          </p>
-        </div>
-      </section>
-    </Card>
+          <span className="h-2 w-2 shrink-0 rounded-full bg-red-500 self-center"></span>
+          <div
+            className={cn(
+              "flex items-center justify-center",
+              showFlag ? "min-w-[17px]" : "min-w-0",
+            )}
+          >
+            {showFlag ? <ServerFlag country_code={country_code} /> : null}
+          </div>
+          <div className="relative">
+            <p
+              className={cn("break-all font-bold tracking-tight", showFlag ? "text-xs" : "text-sm")}
+            >
+              {name}
+            </p>
+          </div>
+        </section>
+      </Card>
+    </Link>
   )
 }