diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx
index a5d78c266..d8a6f77e5 100644
--- a/src/components/Footer/Footer.jsx
+++ b/src/components/Footer/Footer.jsx
@@ -21,9 +21,7 @@ import { getFossologyVersion } from "@/services/info";
 import { getSessionStorage, setSessionStorage } from "@/shared/storageHelper";
 
 const Footer = () => {
-  const [version, setVersion] = useState(
-    getSessionStorage("fossologyVersion") || null
-  );
+  const [version, setVersion] = useState(null);
 
   const fetchVersion = () => {
     return getFossologyVersion()
@@ -36,7 +34,10 @@ const Footer = () => {
   };
 
   useEffect(() => {
-    if (!version) {
+    const cached = getSessionStorage("fossologyVersion");
+    if (cached) {
+      setVersion(cached);
+    } else {
       fetchVersion();
     }
   }, []);
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
index da4db86ec..95027b099 100644
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@@ -46,6 +46,8 @@ import { getLocalStorage, setLocalStorage } from "@/shared/storageHelper";
 
 export default function Header() {
   const [currentGroup, setCurrentGroup] = useState(null);
+  const [authenticated, setAuthenticated] = useState(false);
+  const [groups, setGroups] = useState(null);
   const pathname = usePathname();
   const router = useRouter();
 
@@ -78,6 +80,8 @@ export default function Header() {
       getLocalStorage("currentGroup") ||
       getLocalStorage("user")?.default_group;
     setCurrentGroup(defaultGroup);
+    setAuthenticated(isAuth());
+    setGroups(getAllGroups());
   }, []);
 
   const handleGroupChange = (groupName) => {
@@ -94,7 +98,7 @@ export default function Header() {
         {/* Navigation Menu */}
         <nav className="hidden md:flex">
           <Link href={routes.home} className={clsx("flex items-center h-13 p-4 justify-between", !isHomeActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Home</Link>
-          {isAuth() && (
+          {authenticated && (
             <>
               <Link href={routes.search} className={clsx("flex items-center h-13 p-4 justify-between", !isSearchActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Search</Link>
               <Link href={routes.browse} className={clsx("flex items-center h-13 p-4 justify-between", !isBrowseActive ? "hover:border-b-2 hover:border-[#C31730] hover:font-medium" : "border-b-2 border-[#C31730] font-medium")}>Browse</Link>
@@ -473,7 +477,7 @@ export default function Header() {
       {/* Right Side Icons */}
       <div className="flex items-center gap-6 text-sm text-gray-800">
         {/* Group Dropdown */}
-        {getAllGroups() && (
+        {groups && (
           <DropdownMenu open={isGroupOpen} onOpenChange={setIsGroupOpen}>
             <DropdownMenuTrigger
               onClick={(e) => {
@@ -537,7 +541,7 @@ export default function Header() {
 
                     {isGroupSelectOpen && (
                       <div className="mt-1 border rounded-[4px] border-[#CECECE] shadow bg-white overflow-hidden">
-                        {getAllGroups().map((group) => (
+                        {groups.map((group) => (
                           <div
                             key={group.id}
                             onClick={() => {
diff --git a/src/shared/storageHelper.js b/src/shared/storageHelper.js
index 1fc08f1d9..4f7f61b73 100644
--- a/src/shared/storageHelper.js
+++ b/src/shared/storageHelper.js
@@ -57,7 +57,9 @@ export const setLocalStorage = (key, value) => {
 // Get from localstorage
 export const getLocalStorage = (key) => {
   if (typeof window !== "undefined") {
-    return JSON.parse(localStorage.getItem(key));
+    const item = localStorage.getItem(key);
+    if (item === null || item === "undefined") return null;
+    return JSON.parse(item);
   }
   return null;
 };
@@ -98,7 +100,9 @@ export const defaultAgentsList = () => {
 // Get from session storage
 export const getSessionStorage = (key) => {
   if (typeof window !== "undefined") {
-    return JSON.parse(sessionStorage.getItem(key));
+    const item = sessionStorage.getItem(key);
+    if (item === null || item === "undefined") return null;
+    return JSON.parse(item);
   }
   return null;
 };