diff --git a/clients/web/src/components/groups/ElicitationFormPanel/ElicitationFormPanel.stories.tsx b/clients/web/src/components/groups/ElicitationFormPanel/ElicitationFormPanel.stories.tsx
index aaecba8f..78475a0d 100644
--- a/clients/web/src/components/groups/ElicitationFormPanel/ElicitationFormPanel.stories.tsx
+++ b/clients/web/src/components/groups/ElicitationFormPanel/ElicitationFormPanel.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import type { ElicitRequest } from "@modelcontextprotocol/sdk/types.js";
+import type { ElicitRequestFormParams } from "@modelcontextprotocol/sdk/types.js";
 import { fn } from "storybook/test";
 import { ElicitationFormPanel } from "./ElicitationFormPanel";
 
@@ -28,7 +28,7 @@ const dbRequest = {
       database: { type: "string" as const, title: "Database" },
     },
   },
-} satisfies ElicitRequest["params"];
+} satisfies ElicitRequestFormParams;
 
 const sslRequest = {
   message: "Please select your SSL mode preference.",
@@ -42,7 +42,7 @@ const sslRequest = {
       },
     },
   },
-} satisfies ElicitRequest["params"];
+} satisfies ElicitRequestFormParams;
 
 const deployRequest = {
   message: "Please confirm the deployment.",
@@ -57,7 +57,7 @@ const deployRequest = {
       confirm: { type: "boolean" as const, title: "Confirm deployment" },
     },
   },
-} satisfies ElicitRequest["params"];
+} satisfies ElicitRequestFormParams;
 
 export const SimpleForm: Story = {
   args: { request: dbRequest },
diff --git a/clients/web/src/components/groups/SamplingRequestPanel/SamplingRequestPanel.tsx b/clients/web/src/components/groups/SamplingRequestPanel/SamplingRequestPanel.tsx
index c2c6e393..c403270f 100644
--- a/clients/web/src/components/groups/SamplingRequestPanel/SamplingRequestPanel.tsx
+++ b/clients/web/src/components/groups/SamplingRequestPanel/SamplingRequestPanel.tsx
@@ -85,16 +85,18 @@ export function SamplingRequestPanel({
         <MessageBubble key={index} index={index} message={message} />
       ))}
 
-      {hints.length > 0 && (
+      {modelPreferences && (
         <PreferencesContainer>
           <Stack gap="xs">
             <Title order={5}>Model Preferences:</Title>
-            <Group gap="xs">
-              <Text size="sm">Hints:</Text>
-              {hints.map((hint) => (
-                <Badge key={hint}>{hint}</Badge>
-              ))}
-            </Group>
+            {hints.length > 0 && (
+              <Group gap="xs">
+                <Text size="sm">Hints:</Text>
+                {hints.map((hint) => (
+                  <Badge key={hint}>{hint}</Badge>
+                ))}
+              </Group>
+            )}
             {modelPreferences?.costPriority !== undefined && (
               <Text size="sm">
                 Cost Priority: {formatPriority(modelPreferences.costPriority)}
@@ -160,7 +162,7 @@ export function SamplingRequestPanel({
         />
         <Select
           label="Stop Reason"
-          data={["endTurn", "maxTokens", "stopSequence"]}
+          data={["endTurn", "stopSequence", "maxTokens"]}
           value={draftResult.stopReason ?? null}
           onChange={(value) =>
             onResultChange({