diff --git a/apps/web/modules/event-types/views/event-types-single-view.tsx b/apps/web/modules/event-types/views/event-types-single-view.tsx
index 927227ab73a185..054e891fa822ab 100644
--- a/apps/web/modules/event-types/views/event-types-single-view.tsx
+++ b/apps/web/modules/event-types/views/event-types-single-view.tsx
@@ -227,6 +227,7 @@ const EventTypePage = (props: EventTypeSetupProps & { allActiveWorkflows?: Workf
   const [pendingRoute, setPendingRoute] = useState("");
   const leaveWithoutAssigningHosts = useRef(false);
   const [animationParentRef] = useAutoAnimate<HTMLDivElement>();
+
   const updateMutation = trpc.viewer.eventTypes.update.useMutation({
     onSuccess: async () => {
       const currentValues = formMethods.getValues();
diff --git a/packages/features/bookings/lib/getLocationOptionsForSelect.ts b/packages/features/bookings/lib/getLocationOptionsForSelect.ts
index 8a8963a0d41be9..c5611a09751ff8 100644
--- a/packages/features/bookings/lib/getLocationOptionsForSelect.ts
+++ b/packages/features/bookings/lib/getLocationOptionsForSelect.ts
@@ -26,6 +26,7 @@ export default function getLocationsOptionsForSelect(
         label: translatedLocation || locationString,
         value: type,
         inputPlaceholder: t(eventLocation?.attendeeInputPlaceholder || ""),
+        optionValue: location?.link || location?.address || "",
       };
     })
     .filter(notEmpty);
diff --git a/packages/features/form-builder/Components.tsx b/packages/features/form-builder/Components.tsx
index c6161bda1bf4eb..befc29fcd6246d 100644
--- a/packages/features/form-builder/Components.tsx
+++ b/packages/features/form-builder/Components.tsx
@@ -391,7 +391,7 @@ export const Components: Record<FieldType, Component> = {
         if (!value) {
           setValue({
             value: options[0]?.value,
-            optionValue: "",
+            optionValue: options[0]?.optionValue || "",
           });
         }
       }, [options, setValue, value]);
@@ -429,7 +429,7 @@ export const Components: Record<FieldType, Component> = {
                         onChange={(e) => {
                           setValue({
                             value: e.target.value,
-                            optionValue: "",
+                            optionValue: option?.optionValue || "",
                           });
                         }}
                         checked={value?.value === option.value}