diff --git a/src/routes/company_view.svelte b/src/routes/company_view.svelte
index 251f9b5..450de55 100644
--- a/src/routes/company_view.svelte
+++ b/src/routes/company_view.svelte
@@ -281,6 +281,9 @@
 				fetchExposureStats();
 				if (checkDataAvailability()) {
 					showAnalysisHideAlert();
+					updateScenarioSourceSelector();
+					updateScenarioSelector();
+					updateAllocationMethodSelector();
 					fetchCompanyBubble();
 					fetchCompanyTechmix();
 				} else {
@@ -334,13 +337,7 @@
 
 		setValuesSectorSelectors();
 		setValuesAssetClassSelector();
-		updateScenarioSourceSelector();
-		updateScenarioSelector();
-		updateAllocationMethodSelector();
 		addEventListeners();
-		fetchExposureStats();
-		fetchCompanyBubble();
-		fetchCompanyTechmix();
 	});
 </script>