diff --git a/app/(main)/ClientComponents/ServerDetailClient.tsx b/app/(main)/ClientComponents/ServerDetailClient.tsx
index 98b329a0a..006e821e3 100644
--- a/app/(main)/ClientComponents/ServerDetailClient.tsx
+++ b/app/(main)/ClientComponents/ServerDetailClient.tsx
@@ -29,12 +29,9 @@ export default function ServerDetailClient({
   }, []);
 
   useEffect(() => {
-    const previousPath = sessionStorage.getItem("lastPath");
+    const previousPath = sessionStorage.getItem("fromMainPage");
     if (previousPath) {
       setHasHistory(true);
-    } else {
-      const currentPath = window.location.pathname;
-      sessionStorage.setItem("lastPath", currentPath);
     }
   }, []);
 
diff --git a/components/ServerCard.tsx b/components/ServerCard.tsx
index 28e453611..1795a1ed4 100644
--- a/components/ServerCard.tsx
+++ b/components/ServerCard.tsx
@@ -29,8 +29,12 @@ export default function ServerCard({
   const fixedTopServerName =
     getEnv("NEXT_PUBLIC_FixedTopServerName") === "true";
 
+  const saveSession = () => {
+    sessionStorage.setItem("fromMainPage", "true");
+  };
+
   return online ? (
-    <Link href={`/${id}`} prefetch={true}>
+    <Link onClick={saveSession} href={`/${id}`} prefetch={true}>
       <Card
         className={cn(
           "flex flex-col items-center justify-start gap-3 p-3 md:px-5 cursor-pointer",