diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
index 03e988821e..64c4255c27 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
@@ -87,9 +87,11 @@ export function FileSelectorInput({
   const foreignCheckProvider = subBlock.serviceId
     ? getProviderIdFromServiceId(subBlock.serviceId)
     : (subBlock.provider as string) || ''
+  const normalizedCredentialId = coerceToIdString(connectedCredential)
+  const providerForForeignCheck = foreignCheckProvider || (subBlock.provider as string) || undefined
   const { isForeignCredential } = useForeignCredential(
-    subBlock.provider || subBlock.serviceId || 'outlook',
-    (connectedCredential as string) || ''
+    providerForForeignCheck,
+    normalizedCredentialId
   )
 
   // Get provider-specific values
@@ -123,8 +125,7 @@ export function FileSelectorInput({
 
   const credentialDependencySatisfied = (() => {
     if (!dependsOn.includes('credential')) return true
-    const normalizedCredential = coerceToIdString(connectedCredential)
-    if (!normalizedCredential || normalizedCredential.trim().length === 0) {
+    if (!normalizedCredentialId || normalizedCredentialId.trim().length === 0) {
       return false
     }
     if (isForeignCredential) {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts
index 39474efc54..727b09da22 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts
@@ -17,7 +17,7 @@ export function useForeignCredential(
       setLoading(true)
       setError(null)
       try {
-        if (!normalizedCredentialId) {
+        if (!normalizedProvider || !normalizedCredentialId) {
           if (!cancelled) setIsForeign(false)
           return
         }
diff --git a/apps/sim/blocks/blocks/google_sheets.ts b/apps/sim/blocks/blocks/google_sheets.ts
index dfb0f9faeb..4af33ed2c7 100644
--- a/apps/sim/blocks/blocks/google_sheets.ts
+++ b/apps/sim/blocks/blocks/google_sheets.ts
@@ -48,8 +48,8 @@ export const GoogleSheetsBlock: BlockConfig<GoogleSheetsResponse> = {
       title: 'Select Sheet',
       type: 'file-selector',
       canonicalParamId: 'spreadsheetId',
-      provider: 'google-drive',
-      serviceId: 'google-drive',
+      provider: 'google-sheets',
+      serviceId: 'google-sheets',
       requiredScopes: [
         'https://www.googleapis.com/auth/drive.readonly',
         'https://www.googleapis.com/auth/drive.file',