diff --git a/src/routes/crypto/[tickerID]/+layout.server.ts b/src/routes/crypto/[tickerID]/+layout.server.ts
index 6b0639ca..79b4f5d2 100644
--- a/src/routes/crypto/[tickerID]/+layout.server.ts
+++ b/src/routes/crypto/[tickerID]/+layout.server.ts
@@ -24,22 +24,17 @@ const fetchData = async (apiURL, apiKey, endpoint, ticker) => {
 };
 
 const fetchWatchlist = async (fastifyURL, userId) => {
-  try {
-    const postData = { userId: userId };
-    const response = await fetch(fastifyURL + "/all-watchlists", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(postData),
-    });
+  const postData = { userId: userId };
+  const response = await fetch(fastifyURL + "/all-watchlists", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(postData),
+  });
 
-    const output = (await response.json())?.items;
-    return output;
-  } catch (e) {
-    console.log(e);
-    return [];
-  }
+  const output = (await response.json())?.items;
+  return output;
 };
 
 /*
diff --git a/src/routes/crypto/[tickerID]/+layout.svelte b/src/routes/crypto/[tickerID]/+layout.svelte
index ade0bc19..e50e7fd4 100644
--- a/src/routes/crypto/[tickerID]/+layout.svelte
+++ b/src/routes/crypto/[tickerID]/+layout.svelte
@@ -318,47 +318,45 @@ onMount(async () => {
 
 });
 
+afterUpdate( async () => {
+ 
+ if(previousTicker !== $cryptoTicker && typeof socket !== 'undefined')
+ {
+   previousTicker = $cryptoTicker;
+   //socket.send('close')
+   socket?.close();
+   await new Promise((resolve, reject) => {
+     socket?.addEventListener('close', resolve);
+   });
+  
+   if(socket?.readyState === WebSocket?.CLOSED)
+   {
+     await websocketRealtimeData()
+     console.log('connecting again')
+   }
 
-  afterUpdate(async () => {
-    if (previousTicker !== $cryptoTicker && typeof socket !== "undefined") {
-      previousTicker = $cryptoTicker;
-      //socket.send('close')
-      if (socket?.readyState === WebSocket?.OPEN) {
-        socket?.close();
-      }
-      
-      await new Promise((resolve, reject) => {
-        socket?.addEventListener("close", resolve);
-      });
+ }
 
-      if (socket?.readyState === WebSocket?.CLOSED) {
-        await websocketRealtimeData();
-        console.log("connecting again");
-      }
-    }
-  });
+});
 
 
-  onDestroy(() => {
-    try {
-      //socket?.send('close')
-       if (socket && typeof socket !== "undefined") {
-        if (socket.readyState === WebSocket.OPEN) {
-          socket?.close(); // Close the WebSocket connection
-        }
-        socket = null; // Ensure socket is set to null
-      }
-    }
-    catch(e) {
-      console.log(e)
-    }  
+onDestroy(() => {
+  try {
+    //socket?.send('close')
+    socket?.close()
+  }
+  catch(e) {
+    console.log(e)
+  }  
+ 
+  //$displayCompanyName = '';
+  $currentPortfolioPrice = null;
+  $currentPrice = null;
+  $priceIncrease = null;
+  $traded = false
+  
+});
 
-    //$displayCompanyName = '';
-    $currentPortfolioPrice = null;
-    $currentPrice = null;
-    $priceIncrease = null;
-    //$traded = false
-  });
 
     
     
diff --git a/src/routes/etf/[tickerID]/+layout.server.ts b/src/routes/etf/[tickerID]/+layout.server.ts
index c3af3c27..0eb3c88b 100644
--- a/src/routes/etf/[tickerID]/+layout.server.ts
+++ b/src/routes/etf/[tickerID]/+layout.server.ts
@@ -31,18 +31,13 @@ const fetchData = async (apiURL, apiKey, endpoint, ticker) => {
 };
 
 const fetchFromFastify = async (fastifyURL, endpoint, userId) => {
-  try {
-    const response = await fetch(`${fastifyURL}${endpoint}`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ userId }),
-    });
-    const { items } = await response.json();
-    return items;
-  } catch (e) {
-    console.log(e);
-    return [];
-  }
+  const response = await fetch(`${fastifyURL}${endpoint}`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ userId }),
+  });
+  const { items } = await response.json();
+  return items;
 };
 
 export const load = async ({ params, locals, setHeaders }) => {
diff --git a/src/routes/etf/[tickerID]/+layout.svelte b/src/routes/etf/[tickerID]/+layout.svelte
index ff46e1be..cdcd0972 100644
--- a/src/routes/etf/[tickerID]/+layout.svelte
+++ b/src/routes/etf/[tickerID]/+layout.svelte
@@ -336,9 +336,7 @@ async function fetchPortfolio()
    {
      previousTicker = $etfTicker;
      //socket.send('close')
-      if (socket.readyState === WebSocket.OPEN) {
-        socket?.close(); // Close the WebSocket connection
-      }
+     socket?.close();
      await new Promise((resolve, reject) => {
        socket.addEventListener('close', resolve);
      });
@@ -357,12 +355,7 @@ async function fetchPortfolio()
   onDestroy(() => {
     try {
       //socket?.send('close')
-       if (socket && typeof socket !== "undefined") {
-        if (socket.readyState === WebSocket.OPEN) {
-          socket?.close(); // Close the WebSocket connection
-        }
-        socket = null; // Ensure socket is set to null
-      }
+      socket?.close()
     }
     catch(e) {
       console.log(e)
diff --git a/src/routes/stocks/[tickerID]/+layout.server.ts b/src/routes/stocks/[tickerID]/+layout.server.ts
index 50c30d25..2cb97f2c 100644
--- a/src/routes/stocks/[tickerID]/+layout.server.ts
+++ b/src/routes/stocks/[tickerID]/+layout.server.ts
@@ -31,18 +31,13 @@ const fetchData = async (apiURL, apiKey, endpoint, ticker) => {
 };
 
 const fetchFromFastify = async (fastifyURL, endpoint, userId) => {
-  try {
-    const response = await fetch(`${fastifyURL}${endpoint}`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ userId }),
-    });
-    const { items } = await response.json();
-    return items;
-  } catch (e) {
-    console.log(e);
-    return [];
-  }
+  const response = await fetch(`${fastifyURL}${endpoint}`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ userId }),
+  });
+  const { items } = await response.json();
+  return items;
 };
 
 const fetchCommunitySentiment = async (pb, ticker, cookies) => {
diff --git a/src/routes/stocks/[tickerID]/+layout.svelte b/src/routes/stocks/[tickerID]/+layout.svelte
index 8a125c4b..9b4fa786 100644
--- a/src/routes/stocks/[tickerID]/+layout.svelte
+++ b/src/routes/stocks/[tickerID]/+layout.svelte
@@ -237,10 +237,7 @@ async function fetchPortfolio()
     if (previousTicker !== $stockTicker && typeof socket !== "undefined") {
       previousTicker = $stockTicker;
       //socket.send('close')
-      if (socket?.readyState === WebSocket?.OPEN) {
-        socket?.close();
-      }
-      
+      socket?.close();
       await new Promise((resolve, reject) => {
         socket?.addEventListener("close", resolve);
       });
@@ -255,16 +252,10 @@ async function fetchPortfolio()
   onDestroy(() => {
     try {
       //socket?.send('close')
-       if (socket && typeof socket !== "undefined") {
-        if (socket.readyState === WebSocket.OPEN) {
-          socket?.close(); // Close the WebSocket connection
-        }
-        socket = null; // Ensure socket is set to null
-      }
+      socket?.close();
+    } catch (e) {
+      console.log(e);
     }
-    catch(e) {
-      console.log(e)
-    }  
 
     //$displayCompanyName = '';
     $currentPortfolioPrice = null;
@@ -936,4 +927,4 @@ $: {
   ::-webkit-scrollbar-corner {
     background: #09090b;
   }
-</style>
+</style>
\ No newline at end of file