diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
index fd274c5073..3dc7779d33 100644
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@@ -1465,12 +1465,10 @@ export const webviewMessageHandler = async (
 			break
 		}
 		case "filterMarketplaceItems": {
-			// Check if marketplace is enabled before making API calls
-			const { experiments } = await provider.getState()
-			const config = vscode.workspace.getConfiguration("roo-cline")
-			const isMarketplaceDisabled = config.get<boolean>("disableMarketplace", false)
+			// Get marketplace enabled state from provider's cached value
+			const state = await provider.getStateToPostToWebview()
 
-			if (!experiments.marketplace || isMarketplaceDisabled) {
+			if (!state.marketplaceEnabled) {
 				console.log("Marketplace: Feature disabled, skipping API call")
 				break
 			}
@@ -1492,12 +1490,10 @@ export const webviewMessageHandler = async (
 		}
 
 		case "installMarketplaceItem": {
-			// Check if marketplace is enabled before installing
-			const { experiments } = await provider.getState()
-			const config = vscode.workspace.getConfiguration("roo-cline")
-			const isMarketplaceDisabled = config.get<boolean>("disableMarketplace", false)
+			// Get marketplace enabled state from provider's cached value
+			const state = await provider.getStateToPostToWebview()
 
-			if (!experiments.marketplace || isMarketplaceDisabled) {
+			if (!state.marketplaceEnabled) {
 				console.log("Marketplace: Feature disabled, skipping installation")
 				break
 			}
@@ -1531,12 +1527,10 @@ export const webviewMessageHandler = async (
 		}
 
 		case "removeInstalledMarketplaceItem": {
-			// Check if marketplace is enabled before removing
-			const { experiments } = await provider.getState()
-			const config = vscode.workspace.getConfiguration("roo-cline")
-			const isMarketplaceDisabled = config.get<boolean>("disableMarketplace", false)
+			// Get marketplace enabled state from provider's cached value
+			const state = await provider.getStateToPostToWebview()
 
-			if (!experiments.marketplace || isMarketplaceDisabled) {
+			if (!state.marketplaceEnabled) {
 				console.log("Marketplace: Feature disabled, skipping removal")
 				break
 			}
@@ -1553,12 +1547,10 @@ export const webviewMessageHandler = async (
 		}
 
 		case "installMarketplaceItemWithParameters": {
-			// Check if marketplace is enabled before installing with parameters
-			const { experiments } = await provider.getState()
-			const config = vscode.workspace.getConfiguration("roo-cline")
-			const isMarketplaceDisabled = config.get<boolean>("disableMarketplace", false)
+			// Get marketplace enabled state from provider's cached value
+			const state = await provider.getStateToPostToWebview()
 
-			if (!experiments.marketplace || isMarketplaceDisabled) {
+			if (!state.marketplaceEnabled) {
 				console.log("Marketplace: Feature disabled, skipping installation with parameters")
 				break
 			}