diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php
index be72deca..e7248ae0 100644
--- a/lib/ResponseDefinitions.php
+++ b/lib/ResponseDefinitions.php
@@ -30,6 +30,7 @@
  *     optionalOutputShape: array<string, AssistantShapeDescriptor>,
  *     priority: integer,
  *     category: array{id: string, name: string},
+ *     preferredProviderName: string|null,
  * }
  *
  * @psalm-type AssistantTaskProcessingTask = array{
diff --git a/lib/Service/AssistantService.php b/lib/Service/AssistantService.php
index 99c88769..7dca19b4 100644
--- a/lib/Service/AssistantService.php
+++ b/lib/Service/AssistantService.php
@@ -336,6 +336,14 @@ public function getAvailableTaskTypes(): array {
 		}
 		/** @var string $typeId */
 		foreach ($availableTaskTypes as $typeId => $taskTypeArray) {
+			$preferredProviderName = null;
+			try {
+				$preferredProviderName = $this->taskProcessingManager->getPreferredProvider($typeId)->getName();
+			} catch (TaskProcessingException $e) {
+				$this->logger->debug('Could not get preferred provider for task type ' . $typeId . ': ' . $e->getMessage());
+			} catch (\Throwable $e) {
+				$this->logger->debug('Unexpected error while getting preferred provider for task type ' . $typeId . ': ' . $e->getMessage());
+			}
 			// skip chat, chat with tools and ContextAgent task types (not directly useful to the end user)
 			if (!self::DEBUG) {
 				// this appeared in 33, this is true if the task type class extends the IInternalTaskType
@@ -383,6 +391,7 @@ public function getAvailableTaskTypes(): array {
 					'optionalInputShapeDefaults' => [],
 					'optionalOutputShape' => [],
 					'priority' => self::TASK_TYPE_PRIORITIES['chatty-llm'] ?? 1000,
+					'preferredProviderName' => $preferredProviderName,
 				];
 				// do not add the raw TextToTextChat type
 				if (!self::DEBUG) {
@@ -392,6 +401,7 @@ public function getAvailableTaskTypes(): array {
 			$taskTypeArray['id'] = $typeId;
 			$taskTypeArray['priority'] = self::TASK_TYPE_PRIORITIES[$typeId] ?? 1000;
 			$taskTypeArray['category'] = $this->getCategory($typeId);
+			$taskTypeArray['preferredProviderName'] = $preferredProviderName;
 
 			if ($typeId === TextToText::ID) {
 				$taskTypeArray['name'] = $this->l10n->t('Generate text');
diff --git a/openapi.json b/openapi.json
index 851338be..2db53a8a 100644
--- a/openapi.json
+++ b/openapi.json
@@ -433,7 +433,8 @@
                     "outputShape",
                     "optionalOutputShape",
                     "priority",
-                    "category"
+                    "category",
+                    "preferredProviderName"
                 ],
                 "properties": {
                     "id": {
@@ -487,6 +488,10 @@
                                 "type": "string"
                             }
                         }
+                    },
+                    "preferredProviderName": {
+                        "type": "string",
+                        "nullable": true
                     }
                 }
             }
diff --git a/src/components/AssistantTextProcessingForm.vue b/src/components/AssistantTextProcessingForm.vue
index 9eab6770..bf9d2450 100644
--- a/src/components/AssistantTextProcessingForm.vue
+++ b/src/components/AssistantTextProcessingForm.vue
@@ -53,6 +53,10 @@
 					<div class="session-area__top-bar">
 						<div class="session-area__top-bar__title">
 							<EditableTextField :initial-text="selectedTaskType.name ?? ''" />
+							<span v-if="selectedTaskType.preferredProviderName"
+								class="session-area__top-bar__provider">
+								{{ t('assistant', 'Provider:') }} {{ selectedTaskType.preferredProviderName }}
+							</span>
 						</div>
 					</div>
 					<div v-if="mySelectedTaskTypeId === 'core:text2text:translate'"
@@ -790,7 +794,20 @@ export default {
 			background-color: var(--color-main-background);
 
 			&__title {
+				display: flex;
+				align-items: center;
+				gap: 0.5em;
 				width: 100%;
+				min-width: 0;
+			}
+
+			&__provider {
+				font-weight: normal;
+				font-size: 0.9em;
+				color: var(--color-text-maxcontrast);
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
 			}
 		}
 
diff --git a/src/components/ContextChat/ContextChatInputForm.vue b/src/components/ContextChat/ContextChatInputForm.vue
index 8c06d3eb..e7cad5b8 100644
--- a/src/components/ContextChat/ContextChatInputForm.vue
+++ b/src/components/ContextChat/ContextChatInputForm.vue
@@ -236,7 +236,7 @@ export default {
 			defaultProviderKey: 'files__default',
 
 			sccEnabled: !!this.inputs.scopeType && this.inputs.scopeType !== _ScopeType.NONE && !!this.inputs.scopeList,
-			indexingComplete: loadState('assistant', 'contextChatIndexingComplete'),
+			indexingComplete: loadState('assistant', 'contextChatIndexingComplete', false),
 		}
 	},
 
diff --git a/src/components/TaskTypeSelect.vue b/src/components/TaskTypeSelect.vue
index bf05d00d..52b067f3 100644
--- a/src/components/TaskTypeSelect.vue
+++ b/src/components/TaskTypeSelect.vue
@@ -17,13 +17,13 @@
 				<NcActionButton v-for="t in variants.tasks"
 					:key="t.id"
 					:disabled="selectedTask(t)"
-					:title="t.description"
+					:title="taskTypeTitle(t)"
 					:close-after-click="true"
 					@click="onTaskSelected(t)">
 					<template #icon>
 						<div style="width: 16px" />
 					</template>
-					{{ t.name }}
+					{{ taskTypeLabel(t) }}
 				</NcActionButton>
 				<template #icon>
 					<component :is="variants.icon" />
@@ -61,13 +61,13 @@
 				<NcActionButton v-for="t in categorySubMenuTaskType.tasks"
 					:key="t.id"
 					:disabled="selectedTask(t)"
-					:title="t.description"
+					:title="taskTypeTitle(t)"
 					:close-after-click="true"
 					@click="onTaskSelected(t)">
 					<template #icon>
 						<div style="width: 16px" />
 					</template>
-					{{ t.name }}
+					{{ taskTypeLabel(t) }}
 				</NcActionButton>
 			</template>
 		</NcActions>
@@ -197,6 +197,12 @@ export default {
 	},
 
 	methods: {
+		taskTypeLabel(taskType) {
+			return taskType.name
+		},
+		taskTypeTitle(taskType) {
+			return taskType.description || ''
+		},
 		selectedTask(taskType) {
 			return taskType.id === this.modelValue
 		},