diff --git a/src/components/TastingNoteForm.tsx b/src/components/TastingNoteForm.tsx
index 1f88247..1abb351 100644
--- a/src/components/TastingNoteForm.tsx
+++ b/src/components/TastingNoteForm.tsx
@@ -47,13 +47,16 @@ export default function TastingNoteForm({ bottleId, sessionId }: TastingNoteForm
             // Fetch Bottle Suggestions
             const { data: bottleData } = await supabase
                 .from('bottles')
-                .select('suggested_tags')
+                .select('suggested_tags, suggested_custom_tags')
                 .eq('id', bottleId)
                 .maybeSingle();
 
             if (bottleData?.suggested_tags) {
                 setSuggestedTags(bottleData.suggested_tags);
             }
+            if (bottleData?.suggested_custom_tags) {
+                setSuggestedCustomTags(bottleData.suggested_custom_tags);
+            }
 
             // If Session ID, fetch session participants and pre-select them
             if (effectiveSessionId) {