diff --git a/frigate/http.py b/frigate/http.py
index a4a7c22cd..c33dc34b2 100644
--- a/frigate/http.py
+++ b/frigate/http.py
@@ -1178,6 +1178,11 @@ def ffprobe():
                 {"success": False, "message": f"{camera} is not a valid camera."}, "404"
             )
 
+        if not current_app.frigate_config.cameras[camera].enabled:
+            return jsonify(
+                {"success": False, "message": f"{camera} is not enabled."}, "404"
+            )
+
         paths = map(
             lambda input: input.path,
             current_app.frigate_config.cameras[camera].ffmpeg.inputs,
diff --git a/frigate/util.py b/frigate/util.py
index 537c17f4b..79fe7932f 100755
--- a/frigate/util.py
+++ b/frigate/util.py
@@ -883,6 +883,8 @@ def ffprobe_stream(path: str) -> sp.CompletedProcess:
     clean_path = escape_special_characters(path)
     ffprobe_cmd = [
         "ffprobe",
+        "-timeout",
+        "1000000",
         "-print_format",
         "json",
         "-show_entries",
diff --git a/web/src/routes/System.jsx b/web/src/routes/System.jsx
index df21508b8..6bbfe8efd 100644
--- a/web/src/routes/System.jsx
+++ b/web/src/routes/System.jsx
@@ -224,26 +224,26 @@ export default function System() {
                     <Tbody>
                       <Tr key="capture" index="0">
                         <Td>Capture</Td>
-                        <Td>{cameras[camera]['capture_pid']}</Td>
-                        <Td>{cameras[camera]['process_fps']}</Td>
-                        <Td>{cpu_usages[cameras[camera]['capture_pid']]['cpu']}%</Td>
-                        <Td>{cpu_usages[cameras[camera]['capture_pid']]['mem']}%</Td>
+                        <Td>{cameras[camera]['capture_pid'] || "- "}</Td>
+                        <Td>{cameras[camera]['process_fps'] || "- "}</Td>
+                        <Td>{cpu_usages[cameras[camera]['capture_pid']]?.['cpu'] || "- "}%</Td>
+                        <Td>{cpu_usages[cameras[camera]['capture_pid']]?.['mem'] || "- "}%</Td>
                       </Tr>
                       <Tr key="detect" index="1">
                         <Td>Detect</Td>
-                        <Td>{cameras[camera]['pid']}</Td>
+                        <Td>{cameras[camera]['pid'] || "- "}</Td>
                         <Td>
                           {cameras[camera]['detection_fps']} ({cameras[camera]['skipped_fps']} skipped)
                         </Td>
-                        <Td>{cpu_usages[cameras[camera]['pid']]['cpu']}%</Td>
-                        <Td>{cpu_usages[cameras[camera]['pid']]['mem']}%</Td>
+                        <Td>{cpu_usages[cameras[camera]['pid']]?.['cpu'] || "- "}%</Td>
+                        <Td>{cpu_usages[cameras[camera]['pid']]?.['mem'] || "- "}%</Td>
                       </Tr>
                       <Tr key="ffmpeg" index="2">
                         <Td>ffmpeg</Td>
-                        <Td>{cameras[camera]['ffmpeg_pid']}</Td>
-                        <Td>{cameras[camera]['camera_fps']}</Td>
-                        <Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]['cpu']}%</Td>
-                        <Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]['mem']}%</Td>
+                        <Td>{cameras[camera]['ffmpeg_pid'] || "- "}</Td>
+                        <Td>{cameras[camera]['camera_fps'] || "- "}</Td>
+                        <Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cpu'] || "- "}%</Td>
+                        <Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['mem'] || "- "}%</Td>
                       </Tr>
                     </Tbody>
                   </Table>