diff --git a/packages/ui/src/components/va-select/components/VaSelectContent/VaSelectContent.vue b/packages/ui/src/components/va-select/components/VaSelectContent/VaSelectContent.vue
index 1cb966b7cf..21c0b6e478 100644
--- a/packages/ui/src/components/va-select/components/VaSelectContent/VaSelectContent.vue
+++ b/packages/ui/src/components/va-select/components/VaSelectContent/VaSelectContent.vue
@@ -160,6 +160,7 @@ const autocompleteInputValueComputed = computed({
 
 onMounted(() => {
   if (props.multiple) { return }
+  if (!props.autocomplete) { return }
 
   autocompleteInputValueComputed.value = props.valueString as string
 })
diff --git a/packages/ui/src/components/va-select/hooks/useAutocomplete.ts b/packages/ui/src/components/va-select/hooks/useAutocomplete.ts
index 2fa9dc71eb..5474cac0ad 100644
--- a/packages/ui/src/components/va-select/hooks/useAutocomplete.ts
+++ b/packages/ui/src/components/va-select/hooks/useAutocomplete.ts
@@ -37,6 +37,8 @@ export const useAutocomplete = (
   })
 
   watch(autocompleteValue, (newValue) => {
+    if (!props.autocomplete) { return }
+
     if (newValue && newValue !== getLastOptionText(value.value)) {
       dropdownShown.value = true
     }
diff --git a/packages/ui/src/components/va-select/tests/VaSelect.spec.ts b/packages/ui/src/components/va-select/tests/VaSelect.spec.ts
index 4461674150..e8989ff87a 100644
--- a/packages/ui/src/components/va-select/tests/VaSelect.spec.ts
+++ b/packages/ui/src/components/va-select/tests/VaSelect.spec.ts
@@ -37,7 +37,7 @@ describe('VaSelect', () => {
     wrapper.vm.showDropdownContentComputed = true
     await wrapper.vm.$nextTick()
     const dropdownContent = wrapper.getComponent(VaDropdownContent)
-    expect(dropdownContent.find('.va-select-option--selected').text()).toBe(`${options[1].label}  check`)
+    expect(dropdownContent.find('.va-select-option--selected').text()).toBe(`${options[1].label}   check`)
     expect(wrapper.find('.va-input-wrapper__text').text()).toBe(String(options[1].label))
   })