diff --git a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
index 838b2cb77f1e58f253349621ccb8a75c6e6f0aff..014ef892828277e0e2688b300afc76fe3817e14f 100644
--- a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
+++ b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
@@ -177,7 +177,7 @@ export default function ChangeHostAdmin({
               <Autocomplete
                 autoHighlight
                 id="host"
-                options={query ? hosts?.netBoxHosts ?? [] : []}
+                options={query ? (hosts?.netBoxHosts ?? []) : []}
                 loading={loadingHosts}
                 clearOnBlur={false}
                 value={host}
diff --git a/src/components/IOC/CreateIOC/CreateIOC.js b/src/components/IOC/CreateIOC/CreateIOC.js
index eb3ff5c9ec99cf85778743aacfd18e422c59bec5..30794c04a131f7361e94e7305e01e8297197fc34 100644
--- a/src/components/IOC/CreateIOC/CreateIOC.js
+++ b/src/components/IOC/CreateIOC/CreateIOC.js
@@ -138,7 +138,7 @@ export function CreateIOC() {
           autoHighlight
           id="nameAutocomplete"
           value={namingEntity}
-          options={nameQuery ? names ?? [] : []}
+          options={nameQuery ? (names ?? []) : []}
           loading={loadingNames}
           clearOnBlur={false}
           getOptionLabel={(option) => option?.name ?? ""}
@@ -175,7 +175,7 @@ export function CreateIOC() {
             autoHighlight
             id="gitId"
             value={gitProject}
-            options={repoQuery || gitProject ? allowedGitProjects ?? [] : []}
+            options={repoQuery || gitProject ? (allowedGitProjects ?? []) : []}
             loading={loadingAllowedGitProjects}
             clearOnBlur={false}
             getOptionLabel={(option) => {
diff --git a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
index 9edfc37fe8d4e0b556e0272f61542ea86c9f57cb..3caf691c880f0a0fff9dbb77d29ebb0c41b99322 100644
--- a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
+++ b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
@@ -167,7 +167,7 @@ export function IOCDeployDialog({
           <Autocomplete
             autoHighlight
             id="host"
-            options={query ? hosts?.netBoxHosts ?? [] : []}
+            options={query ? (hosts?.netBoxHosts ?? []) : []}
             loading={loadingHosts}
             clearOnBlur={false}
             value={host}
diff --git a/src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js b/src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js
index 06817fe3b1ca3a7125f2985930f54345b2476dd7..3d23d97697c6c8b714cf91e8b8fb614d432048cc 100644
--- a/src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js
+++ b/src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js
@@ -152,7 +152,7 @@ export default function IOCDetailAdmin({
         <Autocomplete
           autoHighlight
           id="namingName"
-          options={nameQuery ? names ?? [] : []}
+          options={nameQuery ? (names ?? []) : []}
           loading={loading}
           clearOnBlur={false}
           defaultValue={name}
@@ -204,7 +204,7 @@ export default function IOCDetailAdmin({
       <Autocomplete
         autoHighlight
         id="gitId"
-        options={repoQuery || gitId ? allowedGitProjects ?? [] : []}
+        options={repoQuery || gitId ? (allowedGitProjects ?? []) : []}
         loading={loading}
         clearOnBlur={false}
         defaultValue={{