diff --git a/src/components/AddressEdit/AddressEdit.tsx b/src/components/AddressEdit/AddressEdit.tsx
index bf41d66d3..0bc8e93a3 100644
--- a/src/components/AddressEdit/AddressEdit.tsx
+++ b/src/components/AddressEdit/AddressEdit.tsx
@@ -236,11 +236,6 @@ const AddressEdit: React.FC<AddressEditProps> = props => {
             onChange={onCountryChange}
             value={data.country}
             choices={countries}
-            InputProps={{
-              inputProps: {
-                autoComplete: "none"
-              }
-            }}
           />
         </div>
         <div>
diff --git a/src/components/CompanyAddressInput/CompanyAddressForm.tsx b/src/components/CompanyAddressInput/CompanyAddressForm.tsx
index 932518e54..615c02824 100644
--- a/src/components/CompanyAddressInput/CompanyAddressForm.tsx
+++ b/src/components/CompanyAddressInput/CompanyAddressForm.tsx
@@ -176,11 +176,6 @@ const CompanyAddressForm: React.FC<CompanyAddressFormProps> = props => {
           onChange={onCountryChange}
           value={data.country}
           choices={countries}
-          InputProps={{
-            inputProps: {
-              autoComplete: "none"
-            }
-          }}
         />
         <TextField
           disabled={disabled}
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index cb6bab2bd..db5114cc5 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -3979,10 +3979,14 @@ exports[`Storyshots Generics / AddressEdit default 1`] = `
                 class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
               >
                 <input
+                  aria-autocomplete="list"
                   aria-invalid="false"
-                  autocomplete="none"
+                  aria-labelledby="downshift-63-label"
+                  autocomplete="off"
                   class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                  id="downshift-63-input"
                   type="text"
+                  value="Szwecja"
                 />
                 <div
                   class="SingleAutocompleteSelectField-adornment-id"
@@ -64845,10 +64849,14 @@ exports[`Storyshots Views / Customers / Create customer default 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="false"
-                          autocomplete="none"
+                          aria-labelledby="downshift-68-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                          id="downshift-68-input"
                           type="text"
+                          value=""
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"
@@ -65569,10 +65577,14 @@ exports[`Storyshots Views / Customers / Create customer form errors 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="true"
-                          autocomplete="none"
+                          aria-labelledby="downshift-70-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                          id="downshift-70-input"
                           type="text"
+                          value=""
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"
@@ -66274,11 +66286,15 @@ exports[`Storyshots Views / Customers / Create customer loading 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="false"
-                          autocomplete="none"
+                          aria-labelledby="downshift-69-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           disabled=""
+                          id="downshift-69-input"
                           type="text"
+                          value=""
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"
@@ -237970,10 +237986,14 @@ exports[`Storyshots Views / Site settings / Page default 1`] = `
                       class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
                       <input
+                        aria-autocomplete="list"
                         aria-invalid="false"
-                        autocomplete="none"
+                        aria-labelledby="downshift-164-label"
+                        autocomplete="off"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                        id="downshift-164-input"
                         type="text"
+                        value="UA"
                       />
                       <div
                         class="SingleAutocompleteSelectField-adornment-id"
@@ -238722,10 +238742,14 @@ exports[`Storyshots Views / Site settings / Page form errors 1`] = `
                       class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
                       <input
+                        aria-autocomplete="list"
                         aria-invalid="false"
-                        autocomplete="none"
+                        aria-labelledby="downshift-166-label"
+                        autocomplete="off"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                        id="downshift-166-input"
                         type="text"
+                        value="UA"
                       />
                       <div
                         class="SingleAutocompleteSelectField-adornment-id"
@@ -239480,11 +239504,15 @@ exports[`Storyshots Views / Site settings / Page loading 1`] = `
                       class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
                       <input
+                        aria-autocomplete="list"
                         aria-invalid="false"
-                        autocomplete="none"
+                        aria-labelledby="downshift-165-label"
+                        autocomplete="off"
                         class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                         disabled=""
+                        id="downshift-165-input"
                         type="text"
+                        value=""
                       />
                       <div
                         class="SingleAutocompleteSelectField-adornment-id"
@@ -245567,10 +245595,14 @@ exports[`Storyshots Views / Warehouses / Create warehouse default 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="false"
-                          autocomplete="none"
+                          aria-labelledby="downshift-47-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                          id="downshift-47-input"
                           type="text"
+                          value=""
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"
@@ -246041,10 +246073,14 @@ exports[`Storyshots Views / Warehouses / Create warehouse form errors 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="true"
-                          autocomplete="none"
+                          aria-labelledby="downshift-49-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                          id="downshift-49-input"
                           type="text"
+                          value=""
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"
@@ -246506,11 +246542,15 @@ exports[`Storyshots Views / Warehouses / Create warehouse loading 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="false"
-                          autocomplete="none"
+                          aria-labelledby="downshift-48-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           disabled=""
+                          id="downshift-48-input"
                           type="text"
+                          value=""
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"
@@ -246953,10 +246993,14 @@ exports[`Storyshots Views / Warehouses / Warehouse details default 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="false"
-                          autocomplete="none"
+                          aria-labelledby="downshift-50-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                          id="downshift-50-input"
                           type="text"
+                          value="Szwecja"
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"
@@ -247741,10 +247785,14 @@ exports[`Storyshots Views / Warehouses / Warehouse details form errors 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="true"
-                          autocomplete="none"
+                          aria-labelledby="downshift-52-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
+                          id="downshift-52-input"
                           type="text"
+                          value="Szwecja"
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"
@@ -248526,11 +248574,15 @@ exports[`Storyshots Views / Warehouses / Warehouse details loading 1`] = `
                         class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                       >
                         <input
+                          aria-autocomplete="list"
                           aria-invalid="false"
-                          autocomplete="none"
+                          aria-labelledby="downshift-51-label"
+                          autocomplete="off"
                           class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           disabled=""
+                          id="downshift-51-input"
                           type="text"
+                          value=""
                         />
                         <div
                           class="SingleAutocompleteSelectField-adornment-id"