diff --git a/src/views/cipp/ExtensionMappings.jsx b/src/views/cipp/ExtensionMappings.jsx
index b0d25677ef2e..4de976555ccc 100644
--- a/src/views/cipp/ExtensionMappings.jsx
+++ b/src/views/cipp/ExtensionMappings.jsx
@@ -236,16 +236,10 @@ export default function ExtensionMappings({ type, fieldMappings = false, autoMap
                         <CCol xs="5">
                           <RFFSelectSearch
                             name="companyId"
-                            values={listMappingBackendResult.data?.Companies.filter((client) => {
-                              return !Object.values(listMappingBackendResult.data?.Mappings)
-                                .map((value) => {
-                                  return value.value
-                                })
-                                .includes(client.value.toString())
-                            }).map((client) => ({
+                            values={listMappingBackendResult.data?.Companies.map((client) => ({
                               name: client.name,
                               value: client.value,
-                            }))}
+                            })).sort((a, b) => a.name.localeCompare(b.name))}
                             onChange={(e) => setMappingValue(e)}
                             placeholder={`Select a ${type} Organization`}
                             isLoading={listMappingBackendResult.isFetching}