diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 8541858923..404d36f468 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -34,12 +34,12 @@
   export let getOptionValue = (option: O, _index?: number) =>
     option as unknown as V
   export let getOptionIcon = (option: O, _index?: number) =>
-    option as unknown as O
-  export let useOptionIconImage = false
+    option?.icon ?? null
   export let getOptionColour = (option: O, _index?: number) =>
     option as unknown as O
   export let getOptionSubtitle = (option: O, _index?: number) =>
-    option as unknown as O
+    option?.subtitle ?? null
+  export let useOptionIconImage = false
   export let open: boolean = false
   export let readonly: boolean = false
   export let quiet: boolean = false
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index 2957c0fec2..4a921f163c 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -17,11 +17,11 @@
   export let getOptionValue = (option: O, _index?: number) =>
     option as unknown as V
   export let getOptionIcon = (option: O, _index?: number) =>
-    option as unknown as string
+    option?.icon ?? undefined
   export let getOptionColour = (option: O, _index?: number) =>
-    option as unknown as string
+    option?.colour ?? undefined
   export let getOptionSubtitle = (option: O, _index?: number) =>
-    option as unknown as string
+    option?.subtitle ?? undefined
   export let compare = (option: O, value: V) => option === value
   export let useOptionIconImage = false
   export let isOptionEnabled = (option: O, _index?: number) =>