diff --git a/src/lib/components/mods/ModForm.svelte b/src/lib/components/mods/ModForm.svelte
index 92383e6a5..30aa98ab8 100644
--- a/src/lib/components/mods/ModForm.svelte
+++ b/src/lib/components/mods/ModForm.svelte
@@ -12,7 +12,6 @@
   import ModCompatibility from '$lib/components/mods/compatibility/ModCompatibilityEdit.svelte';
   import { getTranslate } from '@tolgee/svelte';
   import { SlideToggle } from '@skeletonlabs/skeleton';
-  import { onMount } from 'svelte';
 
   export const { t } = getTranslate();
 
@@ -51,8 +50,6 @@
     $data.tagIDs = tags.map((tag) => tag.id);
   };
 
-  onMount(computeTags);
-
   $: if (tags) {
     computeTags();
   }
diff --git a/src/lib/components/utils/TagList.svelte b/src/lib/components/utils/TagList.svelte
index 00af1eeb6..a09c02bd7 100644
--- a/src/lib/components/utils/TagList.svelte
+++ b/src/lib/components/utils/TagList.svelte
@@ -3,7 +3,7 @@
   import type { Tag } from '$lib/generated/graphql';
   import { queryStore, getContextClient } from '@urql/svelte';
   import { Autocomplete, type AutocompleteOption, InputChip, type PopupSettings, popup } from '@skeletonlabs/skeleton';
-  import { afterUpdate, onMount } from 'svelte';
+  import { onMount } from 'svelte';
   import TagDisplay from './TagDisplay.svelte';
 
   const client = getContextClient();
@@ -33,10 +33,10 @@
     placement: 'bottom-start'
   };
   let tagList = [];
-  const loadTagList = tags ? () => (tagList = tags.map((t: Tag) => t.name)) : () => {};
+  const loadTagList = () => (tagList = tags.map((t: Tag) => t.name));
 
   onMount(loadTagList);
-  afterUpdate(loadTagList);
+  // afterUpdate(loadTagList);
 
   const addTag = (tag: AutocompleteOption) => {
     const realTag = $getAllTags.data?.getTags?.find((t) => t.id == tag.value);
@@ -55,9 +55,9 @@
   const removeTag = (label: string) => {
     const idx = tags.findIndex((t) => t.name === label);
     tags = [...tags.slice(0, idx), ...tags.slice(idx + 1)];
-    if (tags.length == null) {
-      tags = [];
-    }
+    // if (tags.length == null) {
+    //   tags = [];
+    // }
     loadTagList();
   };
 
diff --git a/src/routes/mod/[modId]/+page.svelte b/src/routes/mod/[modId]/+page.svelte
index 53869231f..14b42f9c6 100644
--- a/src/routes/mod/[modId]/+page.svelte
+++ b/src/routes/mod/[modId]/+page.svelte
@@ -101,9 +101,7 @@
       <h1 class="text-4xl font-bold">{$mod.data.mod.name}</h1>
       <div>
         {#if canUserEdit}
-          <button
-            class="variant-ghost-primary btn"
-            on:click={() => goto(base + '/mod/' + modId + '/edit', { invalidateAll: true })}>
+          <button class="variant-ghost-primary btn" on:click={() => goto(base + '/mod/' + modId + '/edit')}>
             <span class="material-icons pr-2">edit</span>
             Edit</button>
           <button class="variant-ghost-primary btn" on:click={() => modalStore.trigger(deleteModal)}>
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 cb36ba7af..c6c71ce32 100644
--- a/src/routes/mod/[modId]/edit/+page.svelte
+++ b/src/routes/mod/[modId]/edit/+page.svelte
@@ -38,9 +38,7 @@
             background: 'variant-filled-success',
             timeout: 5000
           });
-          goto(base + '/mod/' + modId, {
-            invalidateAll: true
-          });
+          goto(base + '/mod/' + modId);
         }
       });
   };
diff --git a/src/routes/mod/[modId]/edit/+page.ts b/src/routes/mod/[modId]/edit/+page.ts
index 9bd8d7dff..f0214fff8 100644
--- a/src/routes/mod/[modId]/edit/+page.ts
+++ b/src/routes/mod/[modId]/edit/+page.ts
@@ -9,7 +9,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'
     })
   }))
 });