diff --git a/daemon/src/diag.rs b/daemon/src/diag.rs
index 1fd3fcd..7ebca83 100644
--- a/daemon/src/diag.rs
+++ b/daemon/src/diag.rs
@@ -251,7 +251,10 @@ impl DiagTask {
         {
             self.container_count += 1;
 
-            if self.container_count % SPACE_CHECK_INTERVAL_CONTAINERS == 0 {
+            if self
+                .container_count
+                .is_multiple_of(SPACE_CHECK_INTERVAL_CONTAINERS)
+            {
                 let min_continue_bytes = self.min_space_to_continue_mb * 1024 * 1024;
                 let min_start_bytes = self.min_space_to_start_mb * 1024 * 1024;
                 match DiskStats::new(qmdl_store.path.to_str().unwrap()) {
@@ -277,7 +280,10 @@ impl DiagTask {
                         return;
                     }
                     Ok(disk_stats) if disk_stats.available_bytes.unwrap_or(0) < min_start_bytes => {
-                        if self.container_count % (SPACE_CHECK_INTERVAL_CONTAINERS * 10) == 0 {
+                        if self
+                            .container_count
+                            .is_multiple_of(SPACE_CHECK_INTERVAL_CONTAINERS * 10)
+                        {
                             let available_mb =
                                 disk_stats.available_bytes.unwrap_or(0) / 1024 / 1024;
                             warn!("Disk space low: {}MB remaining", available_mb);
diff --git a/daemon/web/src/lib/components/DiskSpaceAlert.svelte b/daemon/web/src/lib/components/DiskSpaceAlert.svelte
new file mode 100644
index 0000000..4a79449
--- /dev/null
+++ b/daemon/web/src/lib/components/DiskSpaceAlert.svelte
@@ -0,0 +1,64 @@
+<script lang="ts">
+    import type { SystemStats } from '$lib/systemStats';
+    import type { Config } from '$lib/utils.svelte';
+    import { get_config } from '$lib/utils.svelte';
+
+    interface Props {
+        stats: SystemStats;
+        is_recording: boolean;
+    }
+
+    let { stats, is_recording }: Props = $props();
+
+    let config: Config | undefined = $state(undefined);
+
+    $effect(() => {
+        if (!config) {
+            get_config().then((c) => (config = c));
+        }
+    });
+
+    let warning_message = $derived.by(() => {
+        if (!config || !stats.disk_stats.available_bytes) return undefined;
+
+        const available_mb = Math.floor(stats.disk_stats.available_bytes / 1024 / 1024);
+        const start_threshold = config.min_space_to_start_recording_mb;
+        const continue_threshold = config.min_space_to_continue_recording_mb;
+
+        if (!is_recording && available_mb < start_threshold) {
+            return `Disk space too low to record: ${available_mb}MB free, ${start_threshold}MB required. Delete old recordings to free space.`;
+        }
+
+        if (is_recording && available_mb < start_threshold) {
+            return `Disk space running low: ${available_mb}MB free. Recording will stop automatically below ${continue_threshold}MB.`;
+        }
+
+        return undefined;
+    });
+</script>
+
+{#if warning_message}
+    <div
+        class="bg-yellow-100 border-yellow-400 drop-shadow p-4 flex flex-col gap-2 border rounded-md"
+    >
+        <span class="text-xl font-bold flex flex-row items-center gap-2 text-yellow-700">
+            <svg
+                class="w-6 h-6 text-yellow-600"
+                aria-hidden="true"
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                fill="currentColor"
+                viewBox="0 0 24 24"
+            >
+                <path
+                    fill-rule="evenodd"
+                    d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm11-4a1 1 0 1 0-2 0v5a1 1 0 1 0 2 0V8Zm-1 7a1 1 0 1 0 0 2h.01a1 1 0 1 0 0-2H12Z"
+                    clip-rule="evenodd"
+                />
+            </svg>
+            Low Disk Space
+        </span>
+        <p>{warning_message}</p>
+    </div>
+{/if}
diff --git a/daemon/web/src/lib/systemStats.ts b/daemon/web/src/lib/systemStats.ts
index 97648f5..88f44cd 100644
--- a/daemon/web/src/lib/systemStats.ts
+++ b/daemon/web/src/lib/systemStats.ts
@@ -18,6 +18,7 @@ export interface DiskStats {
     available_size: string;
     used_percent: string;
     mounted_on: string;
+    available_bytes?: number;
 }
 
 export interface MemoryStats {
diff --git a/daemon/web/src/routes/+page.svelte b/daemon/web/src/routes/+page.svelte
index 5abb235..2d529d5 100644
--- a/daemon/web/src/routes/+page.svelte
+++ b/daemon/web/src/routes/+page.svelte
@@ -11,6 +11,7 @@
     import ConfigForm from '$lib/components/ConfigForm.svelte';
     import ActionErrors from '$lib/components/ActionErrors.svelte';
     import ClockDriftAlert from '$lib/components/ClockDriftAlert.svelte';
+    import DiskSpaceAlert from '$lib/components/DiskSpaceAlert.svelte';
     import LogView from '$lib/components/LogView.svelte';
 
     let manager: AnalysisManager = new AnalysisManager();
@@ -210,6 +211,7 @@
     <ActionErrors />
     <ClockDriftAlert />
     {#if loaded}
+        <DiskSpaceAlert stats={system_stats!} is_recording={!!current_entry} />
         <div class="flex flex-col lg:flex-row gap-4">
             {#if current_entry}
                 <Card