diff --git a/src/lib/server/services/file.ts b/src/lib/server/services/file.ts
index b3086f9..f8153ca 100644
--- a/src/lib/server/services/file.ts
+++ b/src/lib/server/services/file.ts
@@ -97,9 +97,9 @@ export const uploadFile = async (
   params: Omit<NewFileParams, "path">,
   encContentStream: Readable,
 ) => {
-  const oneMinuteAgo = new Date(Date.now() - 60 * 1000);
+  const oneDayAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
   const oneMinuteLater = new Date(Date.now() + 60 * 1000);
-  if (params.dekVersion <= oneMinuteAgo || params.dekVersion >= oneMinuteLater) {
+  if (params.dekVersion <= oneDayAgo || params.dekVersion >= oneMinuteLater) {
     error(400, "Invalid DEK version");
   }
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 091c034..3d058ec 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,11 +1,28 @@
 <script lang="ts">
   import { onMount } from "svelte";
+  import { get } from "svelte/store";
   import { goto as svelteGoto } from "$app/navigation";
-  import { clientKeyStore, masterKeyStore } from "$lib/stores";
+  import { fileUploadStatusStore, clientKeyStore, masterKeyStore } from "$lib/stores";
   import "../app.css";
 
   let { children } = $props();
 
+  const checkFileUploadStatus = (e: BeforeUnloadEvent) => {
+    if (
+      $fileUploadStatusStore.some((statusStore) => {
+        const status = get(statusStore);
+        return (
+          status.status === "encryption-pending" ||
+          status.status === "encrypting" ||
+          status.status === "upload-pending" ||
+          status.status === "uploading"
+        );
+      })
+    ) {
+      e.preventDefault();
+    }
+  };
+
   onMount(async () => {
     const goto = async (url: string) => {
       const whitelist = ["/auth/login", "/key", "/client/pending"];
@@ -24,4 +41,6 @@
   });
 </script>
 
+<svelte:window onbeforeunload={checkFileUploadStatus} />
+
 {@render children()}