diff --git a/package-lock.json b/package-lock.json
index 7da39f6..a2cc48e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.8.0(25)",
+  "version": "2.8.0(26)",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.8.0(25)",
+      "version": "2.8.0(26)",
       "license": "ISC",
       "dependencies": {
         "@chakra-ui/icons": "^2.0.11",
diff --git a/package.json b/package.json
index fc94ce8..ce29757 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.8.0(25)",
+  "version": "2.8.0(26)",
   "description": "",
   "private": true,
   "main": "index.tsx",
diff --git a/src/pages/Device/LogsCard/CommandHistory/Modal.tsx b/src/pages/Device/LogsCard/CommandHistory/Modal.tsx
index 08215b3..b7172f2 100644
--- a/src/pages/Device/LogsCard/CommandHistory/Modal.tsx
+++ b/src/pages/Device/LogsCard/CommandHistory/Modal.tsx
@@ -122,7 +122,7 @@ const CommandDetailsModal = ({ modalProps, command }: Props) => {
                       <AccordionIcon />
                     </AccordionButton>
                   </h2>
-                  <AccordionPanel pb={4}>
+                  <AccordionPanel pb={4} overflowX="auto" overflowY="auto" maxH="500px">
                     <pre>{JSON.stringify(command.results?.status, null, 2)}</pre>
                   </AccordionPanel>
                 </AccordionItem>
@@ -161,7 +161,7 @@ const CommandDetailsModal = ({ modalProps, command }: Props) => {
                     <AccordionIcon />
                   </AccordionButton>
                 </h2>
-                <AccordionPanel pb={4}>
+                <AccordionPanel pb={4} overflowX="auto" overflowY="auto" maxH="500px">
                   <pre>{JSON.stringify(command, null, 2)}</pre>
                 </AccordionPanel>
               </AccordionItem>
diff --git a/src/pages/Device/StatisticsCard/ViewLastStatsModal.tsx b/src/pages/Device/StatisticsCard/ViewLastStatsModal.tsx
index 3e618ad..29d6675 100644
--- a/src/pages/Device/StatisticsCard/ViewLastStatsModal.tsx
+++ b/src/pages/Device/StatisticsCard/ViewLastStatsModal.tsx
@@ -107,7 +107,7 @@ const ViewLastStatsModal = ({ serialNumber }: Props) => {
                       <AccordionIcon />
                     </AccordionButton>
                   </h2>
-                  <AccordionPanel pb={4}>
+                  <AccordionPanel pb={4} overflowX="auto" overflowY="auto" maxH="500px">
                     <pre>{JSON.stringify(getLastStats.data, null, 2)}</pre>
                   </AccordionPanel>
                 </AccordionItem>
diff --git a/src/pages/Device/ViewCapabilitiesModal.tsx b/src/pages/Device/ViewCapabilitiesModal.tsx
index 81e6a22..c5265ea 100644
--- a/src/pages/Device/ViewCapabilitiesModal.tsx
+++ b/src/pages/Device/ViewCapabilitiesModal.tsx
@@ -105,7 +105,7 @@ const ViewCapabilitiesModal = ({ serialNumber }: Props) => {
                       <AccordionIcon />
                     </AccordionButton>
                   </h2>
-                  <AccordionPanel pb={4}>
+                  <AccordionPanel pb={4} overflowX="auto" overflowY="auto" maxH="500px">
                     <pre>{JSON.stringify(getCapabilities.data.capabilities, null, 2)}</pre>
                   </AccordionPanel>
                 </AccordionItem>
diff --git a/src/pages/Device/ViewConfigurationModal.tsx b/src/pages/Device/ViewConfigurationModal.tsx
index 3640909..69f9284 100644
--- a/src/pages/Device/ViewConfigurationModal.tsx
+++ b/src/pages/Device/ViewConfigurationModal.tsx
@@ -76,7 +76,7 @@ const ViewConfigurationModal = ({ configuration }: { configuration?: DeviceConfi
                     <AccordionIcon />
                   </AccordionButton>
                 </h2>
-                <AccordionPanel pb={4}>
+                <AccordionPanel pb={4} overflowX="auto" overflowY="auto" maxH="500px">
                   <pre>{JSON.stringify(configuration, null, 2)}</pre>
                 </AccordionPanel>
               </AccordionItem>