diff --git a/web/screens/LocalServer/Logs.tsx b/web/screens/LocalServer/Logs.tsx
index e301e38ff..125bd93ef 100644
--- a/web/screens/LocalServer/Logs.tsx
+++ b/web/screens/LocalServer/Logs.tsx
@@ -3,19 +3,26 @@ import { useEffect, useState } from 'react'
 
 import React from 'react'
 
+import { useAtomValue } from 'jotai'
+
 import { useServerLog } from '@/hooks/useServerLog'
 
+import { serverEnabledAtom } from '@/helpers/atoms/LocalServer.atom'
+
 const Logs = () => {
   const { getServerLog } = useServerLog()
+  const serverEnabled = useAtomValue(serverEnabledAtom)
   const [logs, setLogs] = useState([])
 
   useEffect(() => {
     getServerLog().then((log) => {
-      if (typeof log?.split === 'function') setLogs(log.split(/\r?\n|\r|\n/g))
+      if (typeof log?.split === 'function') {
+        setLogs(log.split(/\r?\n|\r|\n/g))
+      }
     })
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [logs])
+  }, [logs, serverEnabled])
 
   return (
     <div className="overflow-hidden">
diff --git a/web/screens/SystemMonitor/index.tsx b/web/screens/SystemMonitor/index.tsx
index 941f024f6..ed3b057a1 100644
--- a/web/screens/SystemMonitor/index.tsx
+++ b/web/screens/SystemMonitor/index.tsx
@@ -37,6 +37,19 @@ export default function SystemMonitorScreen() {
       <ScrollArea className="h-full w-full">
         <div className="h-full p-8" data-test-id="testid-system-monitor">
           <div className="grid grid-cols-2 gap-8 lg:grid-cols-3">
+            <div className="rounded-xl border border-border p-4">
+              <div className="flex items-center justify-between">
+                <h4 className="text-base font-bold uppercase">
+                  cpu ({cpuUsage}%)
+                </h4>
+                <span className="text-xs text-muted-foreground">
+                  {cpuUsage}% of 100%
+                </span>
+              </div>
+              <div className="mt-2">
+                <Progress className="mb-2 h-10 rounded-md" value={cpuUsage} />
+              </div>
+            </div>
             <div className="rounded-xl border border-border p-4">
               <div className="flex items-center justify-between">
                 <h4 className="text-base font-bold uppercase">
@@ -53,19 +66,6 @@ export default function SystemMonitorScreen() {
                 />
               </div>
             </div>
-            <div className="rounded-xl border border-border p-4">
-              <div className="flex items-center justify-between">
-                <h4 className="text-base font-bold uppercase">
-                  cpu ({cpuUsage}%)
-                </h4>
-                <span className="text-xs text-muted-foreground">
-                  {cpuUsage}% of 100%
-                </span>
-              </div>
-              <div className="mt-2">
-                <Progress className="mb-2 h-10 rounded-md" value={cpuUsage} />
-              </div>
-            </div>
           </div>
 
           {activeModel && (