diff --git a/package-lock.json b/package-lock.json
index 09aa119cf1d04957c444d39747df26c903b52bbd..131e1a09700fe7b7538110f9c65c1f53c0069849 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,7 +56,7 @@
         "https-browserify": "^1.0.0",
         "msw": "^1.2.1",
         "msw-storybook-addon": "^1.10.0",
-        "prettier": "3.2.5",
+        "prettier": "^3.3.3",
         "prop-types": "^15.8.1",
         "storybook": "^7.6.3",
         "stream-http": "^3.2.0",
@@ -22542,9 +22542,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -45859,9 +45859,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "dev": true
     },
     "pretty-bytes": {
diff --git a/package.json b/package.json
index 549909e3aa2b77102098336cafbd305d9d0d8045..352b349b13b50a339c271e5d9553ff5309d02f45 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "https-browserify": "^1.0.0",
     "msw": "^1.2.1",
     "msw-storybook-addon": "^1.10.0",
-    "prettier": "3.2.5",
+    "prettier": "^3.3.3",
     "prop-types": "^15.8.1",
     "storybook": "^7.6.3",
     "stream-http": "^3.2.0",
diff --git a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
index 6590162e3411fb03f8a522fb73718c80bd7d80d8..0208f5ba0768b9f1044446dc99e9c59e5f69151e 100644
--- a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
+++ b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
@@ -178,7 +178,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 c7970c1729f24d5cdd433339b056974f6f4d85f5..df8a66a243b2534d4b567789b54ee356bff1f85c 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.tsx b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.tsx
index c44efba1b724c85c3e386dea42aacc6df87a047b..6c8f6dc6ae7a5b104b9f1fd7b718c0720f855ba2 100644
--- a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.tsx
+++ b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.tsx
@@ -198,7 +198,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 13ea3d6ee288028a4bd8345cba8a6cc1a0ddb09f..5b07764c00de67dd4acb4c27e00b7236599299e6 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={{
diff --git a/src/components/common/Status/Status.js b/src/components/common/Status/Status.js
index dd15eb0420e0db8a96aabb0d8e90b9559d1b6290..9fcdc785bd08e9522a1ae9c3798fe113b31fcee8 100644
--- a/src/components/common/Status/Status.js
+++ b/src/components/common/Status/Status.js
@@ -65,7 +65,7 @@ export function Status({ state, alert, hideAlerts = false, getStatusFcn }) {
           popoverContents={
             <StatusPopoverContent
               title={statusConfig[status].title}
-              alerts={hideAlerts ? [] : alert?.alerts ?? []}
+              alerts={hideAlerts ? [] : (alert?.alerts ?? [])}
             />
           }
           anchorOrigin={{