diff --git a/Localize/lang/strings.json b/Localize/lang/strings.json
index 5b1175f1782..92fae8d9d62 100644
--- a/Localize/lang/strings.json
+++ b/Localize/lang/strings.json
@@ -626,7 +626,6 @@
   "9bCLPz": "Loading API Management APIs...",
   "9bQctz": "Validation failed for workflows:",
   "9djnqI": "Returns the result from adding the two numbers",
-  "9emgHc": "Specify which HTTP status codes should trigger a retry. Select one or more status codes.",
   "9euy52": "Complete",
   "9gb/xS": "Create",
   "9hKeBq": "Select an Azure OpenAI resource",
@@ -695,6 +694,7 @@
   "BCAnZP": "Either a single format specifier character or a custom format pattern that indicates how to format the value of this timestamp. If format is not provided, the ISO 8601 format ('o') is used.",
   "BCgiRh": "Warning: custom value does not match one of the allowed types for this input",
   "BFBJi2": "No errors found in your map.",
+  "BGOMQF": "Specify which HTTP status codes trigger a retry. Selecting codes here replaces the default retryable set (408, 429, and 5xx), so only the codes you select are retried. Leave empty to keep the default set.",
   "BGw6eH": "Missing required properties ''{missingProperties}'' for authentication type ''{authType}''",
   "BHXsCs": "Authentication",
   "BHe7qY": "Required. The URI encoded string.",
@@ -2583,7 +2583,6 @@
   "_9bCLPz.comment": "Loading API Management APIs...",
   "_9bQctz.comment": "The error title for the workflows tab",
   "_9djnqI.comment": "Label for description of custom add Function",
-  "_9emgHc.comment": "tooltip for retry policy HTTP status codes setting",
   "_9euy52.comment": "Text to indicate that the artifact upload is completed",
   "_9gb/xS.comment": "Button text for creating a group",
   "_9hKeBq.comment": "Select the Azure Cognitive Service Open AI resource to use for this connection",
@@ -2652,6 +2651,7 @@
   "_BCAnZP.comment": "Optional string parameter to identify format of timestamp returned",
   "_BCgiRh.comment": "Warning message for when custom value does not match one of the function node input's allowed types",
   "_BFBJi2.comment": "Message displayed when there are no errors",
+  "_BGOMQF.comment": "tooltip for retry policy HTTP status codes setting",
   "_BGw6eH.comment": "Error message when missing multiple required authentication properties",
   "_BHXsCs.comment": "Label for authentication",
   "_BHe7qY.comment": "Required URI encoded string parameter to be converted using uriComponentToString function",
diff --git a/libs/designer-ui/src/lib/settings/settingsection/__tests__/__snapshots__/settingtagpicker.spec.tsx.snap b/libs/designer-ui/src/lib/settings/settingsection/__tests__/__snapshots__/settingtagpicker.spec.tsx.snap
index f9940ceabf3..23da7df5be7 100644
--- a/libs/designer-ui/src/lib/settings/settingsection/__tests__/__snapshots__/settingtagpicker.spec.tsx.snap
+++ b/libs/designer-ui/src/lib/settings/settingsection/__tests__/__snapshots__/settingtagpicker.spec.tsx.snap
@@ -6,7 +6,6 @@ exports[`ui/settings/settingtagpicker > should construct with basic props 1`] =
 >
   <Combobox
     className="___1s3ioet_0000000 fly5x3f f93ek0f"
-    freeform={true}
     onInput={[Function]}
     onOptionSelect={[Function]}
     placeholder="Select options..."
diff --git a/libs/designer-ui/src/lib/settings/settingsection/constants.ts b/libs/designer-ui/src/lib/settings/settingsection/constants.ts
index 946402d7934..0fb23b5cff7 100644
--- a/libs/designer-ui/src/lib/settings/settingsection/constants.ts
+++ b/libs/designer-ui/src/lib/settings/settingsection/constants.ts
@@ -3,6 +3,10 @@ import type { TagPickerOption } from './settingtagpicker';
 /**
  * HTTP status code options for retry policy configuration.
  * Includes 4xx client errors and 5xx server errors.
+ *
+ * Note: When a custom list is set on a retry policy, it replaces the default
+ * retryable set (408, 429, and 5xx). The defaults are intentionally kept in
+ * this list so users can re-add them alongside their custom codes.
  */
 export const HTTP_STATUS_CODE_OPTIONS: TagPickerOption[] = [
   // 4xx Client Errors
@@ -35,6 +39,7 @@ export const HTTP_STATUS_CODE_OPTIONS: TagPickerOption[] = [
   { label: '429 - Too Many Requests', value: '429' },
   { label: '431 - Request Header Fields Too Large', value: '431' },
   { label: '451 - Unavailable For Legal Reasons', value: '451' },
+  { label: '499 - Client Closed Request', value: '499' },
   // 5xx Server Errors
   { label: '500 - Internal Server Error', value: '500' },
   { label: '501 - Not Implemented', value: '501' },
diff --git a/libs/designer-ui/src/lib/settings/settingsection/settingtagpicker.tsx b/libs/designer-ui/src/lib/settings/settingsection/settingtagpicker.tsx
index 7bfc6923e92..7aa11d67601 100644
--- a/libs/designer-ui/src/lib/settings/settingsection/settingtagpicker.tsx
+++ b/libs/designer-ui/src/lib/settings/settingsection/settingtagpicker.tsx
@@ -83,7 +83,6 @@ export const SettingTagPicker = ({
         onInput={(e) => setInputValue((e.target as HTMLInputElement).value)}
         onOptionSelect={handleOptionSelect}
         positioning="below"
-        freeform
       >
         {filteredOptions.map((option) => (
           <Option key={option.value} value={option.value}>
diff --git a/libs/designer-v2/src/lib/ui/settings/sections/networking.tsx b/libs/designer-v2/src/lib/ui/settings/sections/networking.tsx
index f4114a4d5f9..fbadda1578a 100644
--- a/libs/designer-v2/src/lib/ui/settings/sections/networking.tsx
+++ b/libs/designer-v2/src/lib/ui/settings/sections/networking.tsx
@@ -305,8 +305,9 @@ export const Networking = ({
     description: 'title for retry policy HTTP status codes setting',
   });
   const retryPolicyHttpStatusCodesTooltip = intl.formatMessage({
-    defaultMessage: 'Specify which HTTP status codes should trigger a retry. Select one or more status codes.',
-    id: '9emgHc',
+    defaultMessage:
+      'Specify which HTTP status codes trigger a retry. Selecting codes here replaces the default retryable set (408, 429, and 5xx), so only the codes you select are retried. Leave empty to keep the default set.',
+    id: 'BGOMQF',
     description: 'tooltip for retry policy HTTP status codes setting',
   });
 
diff --git a/libs/designer/src/lib/ui/settings/sections/networking.tsx b/libs/designer/src/lib/ui/settings/sections/networking.tsx
index f4114a4d5f9..fbadda1578a 100644
--- a/libs/designer/src/lib/ui/settings/sections/networking.tsx
+++ b/libs/designer/src/lib/ui/settings/sections/networking.tsx
@@ -305,8 +305,9 @@ export const Networking = ({
     description: 'title for retry policy HTTP status codes setting',
   });
   const retryPolicyHttpStatusCodesTooltip = intl.formatMessage({
-    defaultMessage: 'Specify which HTTP status codes should trigger a retry. Select one or more status codes.',
-    id: '9emgHc',
+    defaultMessage:
+      'Specify which HTTP status codes trigger a retry. Selecting codes here replaces the default retryable set (408, 429, and 5xx), so only the codes you select are retried. Leave empty to keep the default set.',
+    id: 'BGOMQF',
     description: 'tooltip for retry policy HTTP status codes setting',
   });