diff --git a/src/routes/stocks/[tickerID]/+layout.svelte b/src/routes/stocks/[tickerID]/+layout.svelte
index 5babf75c..dbc6ffef 100644
--- a/src/routes/stocks/[tickerID]/+layout.svelte
+++ b/src/routes/stocks/[tickerID]/+layout.svelte
@@ -13,7 +13,6 @@
     currentPrice,
     priceIncrease,
     stockTicker,
-    assetType,
     displayCompanyName,
     isOpen,
     shouldUpdatePriceChart,
@@ -235,10 +234,6 @@ function handleTypeOfTrade(state:string)
   let PriceAlert;
 
   onMount(async () => {
-    stockTicker.set(data?.getParams?.toUpperCase());
-    assetType.set("stock");
-    displayCompanyName.set(data?.companyName);
-
     if (!data?.user) {
       LoginPopup = (await import("$lib/components/LoginPopup.svelte")).default;
     } else {
@@ -320,9 +315,6 @@ function handleTypeOfTrade(state:string)
 
   $: {
     if ($page?.url?.pathname && typeof window !== "undefined") {
-      stockTicker.update((value) => (value = data?.getParams?.toUpperCase()));
-      assetType.update((value) => (value = "stock"));
-      displayCompanyName.update((value) => (value = data?.companyName));
       const parts = $page?.url?.pathname?.split("/");
       const sectionMap = {
         statistics: "statistics",
diff --git a/src/routes/stocks/[tickerID]/+layout.ts b/src/routes/stocks/[tickerID]/+layout.ts
index a1e6e7b9..1e4724c9 100644
--- a/src/routes/stocks/[tickerID]/+layout.ts
+++ b/src/routes/stocks/[tickerID]/+layout.ts
@@ -3,6 +3,9 @@ import {
   isAfterMarketClose,
   isBeforeMarketOpen,
   isWeekend,
+  stockTicker,
+  displayCompanyName,
+  assetType,
 } from "$lib/store";
 
 const checkMarketHour = async () => {
@@ -50,5 +53,8 @@ const checkMarketHour = async () => {
 };
 
 export const load = async ({ params, data }) => {
+  stockTicker.set(data?.getParams?.toUpperCase());
+  assetType.set("stock");
+  displayCompanyName.set(data?.companyName);
   await checkMarketHour();
 };
diff --git a/src/routes/stocks/[tickerID]/+page.svelte b/src/routes/stocks/[tickerID]/+page.svelte
index 4e95ccc2..b304482d 100644
--- a/src/routes/stocks/[tickerID]/+page.svelte
+++ b/src/routes/stocks/[tickerID]/+page.svelte
@@ -13,6 +13,7 @@
     wsAskPrice,
     currentPortfolioPrice,
     stockTicker,
+    displayCompanyName,
     isOpen,
     isBeforeMarketOpen,
     isWeekend,
@@ -744,22 +745,21 @@
   <meta name="viewport" content="width=device-width" />
   <title>
     {$numberOfUnreadNotification > 0 ? `(${$numberOfUnreadNotification})` : ""}
-    {data?.companyName} ({data?.getParams?.toUpperCase()}) Stock Price, Quote &
-    News · stocknear
+    {$displayCompanyName} ({$stockTicker}) Stock Price, Quote & News · stocknear
   </title>
 
   <meta
     name="description"
-    content={`Get a real-time ${data?.companyName} (${data?.getParams?.toUpperCase()}) stock chart, price quote with breaking news, financials, statistics, charts and more.`}
+    content={`Get a real-time ${$displayCompanyName} (${$stockTicker}) stock chart, price quote with breaking news, financials, statistics, charts and more.`}
   />
   <!-- Other meta tags -->
   <meta
     property="og:title"
-    content={`${data?.companyName} (${data?.getParams?.toUpperCase()}) Stock Price, Quote & News · stocknear`}
+    content={`${$displayCompanyName} (${$stockTicker}) Stock Price, Quote & News · stocknear`}
   />
   <meta
     property="og:description"
-    content={`Get a real-time ${data?.companyName} (${data?.getParams?.toUpperCase()}) stock chart, price quote with breaking news, financials, statistics, charts and more.`}
+    content={`Get a real-time ${$displayCompanyName} (${$stockTicker}) stock chart, price quote with breaking news, financials, statistics, charts and more.`}
   />
   <!--<meta property="og:image" content="https://stocknear-pocketbase.s3.amazonaws.com/logo/meta_logo.jpg"/>-->
   <meta property="og:type" content="website" />
@@ -769,11 +769,11 @@
   <meta name="twitter:card" content="summary_large_image" />
   <meta
     name="twitter:title"
-    content={`${data?.companyName} (${data?.getParams?.toUpperCase()}) Stock Price, Quote & News · stocknear`}
+    content={`${$displayCompanyName} (${$stockTicker}) Stock Price, Quote & News · stocknear`}
   />
   <meta
     name="twitter:description"
-    content={`Get a real-time ${data?.companyName} (${data?.getParams?.toUpperCase()}) stock chart, price quote with breaking news, financials, statistics, charts and more.`}
+    content={`Get a real-time ${$displayCompanyName} (${$stockTicker}) stock chart, price quote with breaking news, financials, statistics, charts and more.`}
   />
   <!--<meta name="twitter:image" content="https://stocknear-pocketbase.s3.amazonaws.com/logo/meta_logo.jpg"/>-->
   <!-- Add more Twitter meta tags as needed -->
@@ -883,7 +883,7 @@
           <div
             class="hidden sm:flex flex-row items-center pl-1 sm:pl-6 w-full mt-4"
           >
-            {#if !$stockTicker.includes(".")}
+            {#if !$stockTicker?.includes(".")}
               <DropdownMenu.Root>
                 <DropdownMenu.Trigger asChild let:builder>
                   <Button