diff --git a/web-app/src/routes/settings/hardware.tsx b/web-app/src/routes/settings/hardware.tsx
index 23f4eafef..d2dd65160 100644
--- a/web-app/src/routes/settings/hardware.tsx
+++ b/web-app/src/routes/settings/hardware.tsx
@@ -98,7 +98,7 @@ function SortableGPUItem({ gpu, index }: { gpu: GPU; index: number }) {
           title="Driver Version"
           actions={
             <span className="text-main-view-fg/80">
-              {gpu.additional_information?.driver_version}
+              {gpu.additional_information?.driver_version || '-'}
             </span>
           }
         />
@@ -106,7 +106,7 @@ function SortableGPUItem({ gpu, index }: { gpu: GPU; index: number }) {
           title="Compute Capability"
           actions={
             <span className="text-main-view-fg/80">
-              {gpu.additional_information?.compute_cap}
+              {gpu.additional_information?.compute_cap || '-'}
             </span>
           }
         />
@@ -157,7 +157,7 @@ function Hardware() {
   }
 
   useEffect(() => {
-    if (pollingPaused) return;
+    if (pollingPaused) return
     const intervalId = setInterval(() => {
       getHardwareInfo().then((data) => {
         updateCPUUsage(data.cpu.usage)
diff --git a/web-app/src/routes/system-monitor.tsx b/web-app/src/routes/system-monitor.tsx
index fed013ed6..30ee0bda5 100644
--- a/web-app/src/routes/system-monitor.tsx
+++ b/web-app/src/routes/system-monitor.tsx
@@ -224,7 +224,7 @@ function SystemMonitor() {
                         Driver Version:
                       </span>
                       <span className="text-main-view-fg">
-                        {gpu.additional_information.driver_version}
+                        {gpu.additional_information?.driver_version || '-'}
                       </span>
                     </div>
                     <div className="flex justify-between items-center">
@@ -232,7 +232,7 @@ function SystemMonitor() {
                         Compute Capability:
                       </span>
                       <span className="text-main-view-fg">
-                        {gpu.additional_information.compute_cap}
+                        {gpu.additional_information?.compute_cap || '-'}
                       </span>
                     </div>
                     <div className="mt-2">