diff --git a/src/components/admin/devices/device-custom-field-manager.tsx b/src/components/admin/devices/device-custom-field-manager.tsx
index c89a65e..2ac3b86 100644
--- a/src/components/admin/devices/device-custom-field-manager.tsx
+++ b/src/components/admin/devices/device-custom-field-manager.tsx
@@ -342,13 +342,14 @@ export function DeviceCustomFieldManager({
                   <label className="text-xs font-medium text-neutral-600">Empresa</label>
                   <SearchableCombobox
                     value={companySelection}
-                    onChange={(value) => setCompanySelection(value)}
+                    onValueChange={(value) => setCompanySelection(value ?? "all")}
                     options={[
                       { value: "all", label: "Todas as empresas" },
                       ...companyOptions,
                     ]}
+                    placeholder="Selecionar empresa..."
                     searchPlaceholder="Pesquisar empresa..."
-                    emptyMessage="Nenhuma empresa encontrada."
+                    emptyText="Nenhuma empresa encontrada."
                   />
                 </div>
                 <label className="inline-flex items-center gap-2 text-xs font-medium text-neutral-600">