diff --git a/src/routes/stocks/[tickerID]/forecast/analyst/+page.svelte b/src/routes/stocks/[tickerID]/forecast/analyst/+page.svelte
index f1d71d2e..35c10844 100644
--- a/src/routes/stocks/[tickerID]/forecast/analyst/+page.svelte
+++ b/src/routes/stocks/[tickerID]/forecast/analyst/+page.svelte
@@ -3,7 +3,7 @@
 import {numberOfUnreadNotification, displayCompanyName, stockTicker, currentPortfolioPrice} from '$lib/store';
 import InfoModal from '$lib/components/InfoModal.svelte';
 import InfiniteLoading from '$lib/components/InfiniteLoading.svelte';
-import { goto } from '$app/navigation';
+
 import UpgradeToPro from '$lib/components/UpgradeToPro.svelte';
 
 export let data;
@@ -252,7 +252,7 @@ changeTab(0)
                                   <tr class="{latestInfoDate(item?.date) ? 'bg-[#F9AB00] bg-opacity-[0.1]' : 'odd:bg-[#27272A]'} border-b-[#09090B]  {index+1 === historyList?.slice(0,3)?.length && data?.user?.tier !== 'Pro' ? 'opacity-[0.1]' : ''}">
                                     <td class="text-sm sm:text-[1rem] whitespace-nowrap text-start">
                                       <div class="flex flex-col items-start">
-                                        <a href={`/analysts/${item?.analystId}`} class="sm:hover:text-white text-blue-400">{item?.analyst_name} </a>
+                                        <a href={item?.analystId !== null ? `/analysts/${item?.analystId}` : '#'} class="sm:hover:text-white text-blue-400">{item?.analyst_name} </a>
                                         <span class="text-white">{item?.analyst?.length > 15 ? item?.analyst?.slice(0,15) + '...' : item?.analyst}</span>
                                         
                                             <div class="flex flex-row items-center mt-1">