diff --git a/frontend/src/components/bloomberg-view.tsx b/frontend/src/components/bloomberg-view.tsx
index 2453793..697011a 100644
--- a/frontend/src/components/bloomberg-view.tsx
+++ b/frontend/src/components/bloomberg-view.tsx
@@ -37,10 +37,11 @@ export function BloombergView({ companyId, companySymbol, companyMarket, company
     }, [companySymbol, companyMarket, companyName])
 
     // Use Hook
-    const { fetching, fetchData, updateStatus } = useFinancialData(companyObj, "Bloomberg")
+    const { status, fetching, fetchData, updateStatus } = useFinancialData(companyObj, "Bloomberg")
 
     const loadData = async () => {
-        if (!companyId) {
+        const targetId = status?.company_id || companyId
+        if (!targetId) {
             setLoading(false) // Stop loading if no ID
             setData(null)
             return
@@ -49,8 +50,8 @@ export function BloombergView({ companyId, companySymbol, companyMarket, company
         setLoading(true)
         setError("")
         try {
-            console.log(`Fetching Bloomberg data for company: ${companyId} (${frequency})`)
-            const result = await getFinancialData(companyId, "Bloomberg", frequency)
+            console.log(`Fetching Bloomberg data for company: ${targetId} (${frequency})`)
+            const result = await getFinancialData(targetId, "Bloomberg", frequency)
             console.log("Bloomberg data result:", result)
             setData(result)
         } catch (err: any) {
@@ -63,7 +64,7 @@ export function BloombergView({ companyId, companySymbol, companyMarket, company
 
     useEffect(() => {
         loadData()
-    }, [companyId, lastUpdate, frequency])
+    }, [companyId, status?.company_id, lastUpdate, frequency])
 
     // Re-load data when fetch completes
     useEffect(() => {