diff --git a/frontend/src/components/fleet/AddDeviceForm.tsx b/frontend/src/components/fleet/AddDeviceForm.tsx
index ab59003..eb475b7 100644
--- a/frontend/src/components/fleet/AddDeviceForm.tsx
+++ b/frontend/src/components/fleet/AddDeviceForm.tsx
@@ -247,11 +247,11 @@ export function AddDeviceForm({ tenantId, open, onClose }: Props) {
     </>
   )
 
-  // Helper to get profile list as array
+  // Helper to get profile list as array (list() already unwraps the wrapper)
   const rosProfileList: CredentialProfileResponse[] =
-    rosProfiles?.profiles ?? []
+    Array.isArray(rosProfiles) ? rosProfiles : (rosProfiles?.profiles ?? [])
   const snmpCredProfileList: CredentialProfileResponse[] =
-    (snmpCredProfiles?.profiles ?? []).filter(
+    (Array.isArray(snmpCredProfiles) ? snmpCredProfiles : (snmpCredProfiles?.profiles ?? [])).filter(
       (p) => p.credential_type === 'snmp_v2c' || p.credential_type === 'snmp_v3',
     )
 
diff --git a/frontend/src/components/fleet/BulkAddForm.tsx b/frontend/src/components/fleet/BulkAddForm.tsx
index f91fca5..cb9d73d 100644
--- a/frontend/src/components/fleet/BulkAddForm.tsx
+++ b/frontend/src/components/fleet/BulkAddForm.tsx
@@ -87,7 +87,7 @@ export function BulkAddForm({
     enabled: deviceType === 'snmp',
   })
 
-  const allProfiles: CredentialProfileResponse[] = profiles?.profiles ?? []
+  const allProfiles: CredentialProfileResponse[] = Array.isArray(profiles) ? profiles : (profiles?.profiles ?? [])
   const profileList = deviceType === 'snmp'
     ? allProfiles.filter((p) => p.credential_type === 'snmp_v2c' || p.credential_type === 'snmp_v3')
     : allProfiles