diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 78436ffc56..bc39a80209 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -69,7 +69,7 @@ const error = ref<string | undefined>("");
 watch(error, () => emit("error", error.value));
 
 //We set the value prop as a reference for update reason
-const selectedValue = ref("");
+const selectedValue = ref(props.modelValue);
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
diff --git a/frontend/src/components/forms/RadioInputComponent.vue b/frontend/src/components/forms/RadioInputComponent.vue
index 2a3cba63b8..589fb669cc 100644
--- a/frontend/src/components/forms/RadioInputComponent.vue
+++ b/frontend/src/components/forms/RadioInputComponent.vue
@@ -4,9 +4,7 @@
     orientation="vertical"
     :name="id + 'rb'"
     v-model="selectedValue"
-    @bx-radio-button-group-changed="
-      (event:any) => (selectedValue = event.detail.value)
-    "
+    @bx-radio-button-group-changed="updateSelectedValue"
   >
     <bx-radio-button
       v-for="option in modelValue"
@@ -18,7 +16,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { ref, watch  } from "vue";
 import { type CodeDescrType, isEmpty } from "@/core/CommonTypes";
 
 const props = defineProps<{
@@ -69,4 +67,7 @@ watch(selectedValue, () => {
 
 //We watch for error changes to emit events
 watch(error, () => emit("error", error.value));
+
+const updateSelectedValue = (event: any) =>(selectedValue.value = event.detail.value);
+
 </script>