diff --git a/src/lib/components/mods/ModForm.svelte b/src/lib/components/mods/ModForm.svelte
index a62f7e055..30aa98ab8 100644
--- a/src/lib/components/mods/ModForm.svelte
+++ b/src/lib/components/mods/ModForm.svelte
@@ -45,14 +45,13 @@
     onSubmit: (submitted: ModData) => onSubmit(trimNonSchema(submitted, modSchema))
   });
 
-  let tags = [];
-  $: {
-    const anyData = $data;
-    if (anyData.tags) {
-      tags = anyData.tags;
-      delete anyData.tags;
-    }
+  let tags = $data.tags;
+  const computeTags = () => {
     $data.tagIDs = tags.map((tag) => tag.id);
+  };
+
+  $: if (tags) {
+    computeTags();
   }
 
   // The GQL type NewMod does not have a compatibility field.
diff --git a/src/lib/components/utils/TagList.svelte b/src/lib/components/utils/TagList.svelte
index ac88464da..ff16f85fa 100644
--- a/src/lib/components/utils/TagList.svelte
+++ b/src/lib/components/utils/TagList.svelte
@@ -32,7 +32,6 @@
     target: 'popupAutocomplete',
     placement: 'bottom-start'
   };
-
   let tagList = [];
   const loadTagList = () => (tagList = tags.map((t: Tag) => t.name));
 
@@ -55,7 +54,6 @@
   const removeTag = (label: string) => {
     const idx = tags.findIndex((t) => t.name === label);
     tags = [...tags.slice(0, idx), ...tags.slice(idx + 1)];
-
     loadTagList();
   };
 
@@ -64,7 +62,7 @@
 
 <div class="tags">
   {#if !editable}
-    {#if tags.length > 0}
+    {#if tags && tags.length > 0}
       <div class="text-md flex flex-row flex-wrap gap-1">
         {#each tags as tag}
           <TagDisplay {tag} {popupTriggerEvent} />
diff --git a/src/routes/mod/[modId]/+page.ts b/src/routes/mod/[modId]/+page.ts
index 8ac7651dc..3bda9d975 100644
--- a/src/routes/mod/[modId]/+page.ts
+++ b/src/routes/mod/[modId]/+page.ts
@@ -11,7 +11,8 @@ export const load: PageLoad = async ({ params, parent }) => ({
     mod: queryStore({
       query: GetModDocument,
       client: (await parent()).client,
-      variables: { mod: params.modId }
+      variables: { mod: params.modId },
+      requestPolicy: 'network-only'
     })
   }))
 });
diff --git a/src/routes/mod/[modId]/edit/+page.svelte b/src/routes/mod/[modId]/edit/+page.svelte
index b947ae554..c6c71ce32 100644
--- a/src/routes/mod/[modId]/edit/+page.svelte
+++ b/src/routes/mod/[modId]/edit/+page.svelte
@@ -1,28 +1,21 @@
 <script lang="ts">
-  import { getContextClient, queryStore } from '@urql/svelte';
-  import { EditModDocument, GetModDocument } from '$lib/generated';
+  import { getContextClient } from '@urql/svelte';
+  import { EditModDocument } from '$lib/generated';
   import { goto } from '$app/navigation';
   import ModForm from '$lib/components/mods/ModForm.svelte';
   import type { ModData } from '$lib/models/mods';
   import { base } from '$app/paths';
   import MetaDescriptors from '$lib/components/utils/MetaDescriptors.svelte';
-  import { get } from 'svelte/store';
   import type { PageData } from './$types';
   import { getToastStore } from '@skeletonlabs/skeleton';
+  import { get } from 'svelte/store';
 
   export let data: PageData;
 
-  const { modId } = data;
-
   const client = getContextClient();
-
   const toastStore = getToastStore();
 
-  const mod = queryStore({
-    query: GetModDocument,
-    client,
-    variables: { mod: modId }
-  });
+  $: ({ modId, mod } = data);
 
   const onSubmit = (modData: ModData) => {
     client
@@ -45,7 +38,7 @@
             background: 'variant-filled-success',
             timeout: 5000
           });
-          goto(base + '/mod/' + value.data.updateMod.id);
+          goto(base + '/mod/' + modId);
         }
       });
   };
diff --git a/src/routes/mod/[modId]/edit/+page.ts b/src/routes/mod/[modId]/edit/+page.ts
index 9a95a14e6..f0214fff8 100644
--- a/src/routes/mod/[modId]/edit/+page.ts
+++ b/src/routes/mod/[modId]/edit/+page.ts
@@ -1,5 +1,16 @@
+import { GetModDocument } from '$lib/generated';
+import { loadWaitForNoFetch } from '$lib/utils/gql';
+import { queryStore } from '@urql/svelte';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ params }) => ({
-  ...params
+export const load: PageLoad = async ({ params, parent }) => ({
+  ...params,
+  ...(await loadWaitForNoFetch({
+    mod: queryStore({
+      query: GetModDocument,
+      client: (await parent()).client,
+      variables: { mod: params.modId },
+      requestPolicy: 'network-only'
+    })
+  }))
 });