diff --git a/clients/web/src/routes/(app)/org-manager/scrims/+page.svelte b/clients/web/src/routes/(app)/org-manager/scrims/+page.svelte
index b3c70cc6..fc72e275 100644
--- a/clients/web/src/routes/(app)/org-manager/scrims/+page.svelte
+++ b/clients/web/src/routes/(app)/org-manager/scrims/+page.svelte
@@ -9,6 +9,10 @@
 
 	$: ({ ScrimManagementPage } = data);
 
+	onMount(() => {
+		ScrimManagementPage.fetch();
+	})
+
 	$: groupedScrims = groupBy($ScrimManagementPage?.data?.allScrims ?? [], (s) => s.game.name);
 	const manageScrimsHydrator = new ManageScrimsHydrationStore();
 	manageScrimsHydrator.listen();
diff --git a/clients/web/src/routes/(app)/scrims/+page.gql b/clients/web/src/routes/(app)/scrims/+page.gql
index d75d015c..98e0d9b4 100644
--- a/clients/web/src/routes/(app)/scrims/+page.gql
+++ b/clients/web/src/routes/(app)/scrims/+page.gql
@@ -6,6 +6,7 @@ query ScrimPageRoot {
 		...ScrimFlow_Fragment
 		id
 		state
+		complete
 	}
 	pendingScrims @list(name: "ScrimPage_PendingScrims") {
 		...ScrimList_Fragment
@@ -16,5 +17,6 @@ query ScrimPageRoot {
 			checkedIn
 		}
 		participantCount
+		complete
 	}
 }
diff --git a/clients/web/src/routes/(app)/scrims/+page.svelte b/clients/web/src/routes/(app)/scrims/+page.svelte
index 5720b469..b8a5d50f 100644
--- a/clients/web/src/routes/(app)/scrims/+page.svelte
+++ b/clients/web/src/routes/(app)/scrims/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { PendingScrimHydrationStore, CurrentScrimHydrationStore, cache } from '$houdini';
+	import { onMount } from 'svelte';
 	import type { PageData } from './$houdini';
 	import ScrimFlow from './ScrimFlow.svelte';
 	import ScrimList from './ScrimList.svelte';
@@ -7,8 +8,10 @@
 	export let data: PageData;
 	$: ({ ScrimPageRoot } = data);
 
+
 	const pendingScrimsHydration = new PendingScrimHydrationStore();
-	pendingScrimsHydration.listen();
+	const currentScrimHydration = new CurrentScrimHydrationStore();
+	
 	$: if ($pendingScrimsHydration.data) {
 		const scrimCache = cache.get('Scrim', $pendingScrimsHydration.data.live);
 		if (scrimCache && $pendingScrimsHydration.data.live.complete) {
@@ -17,8 +20,18 @@
 			cache.list('ScrimPage_PendingScrims').append(scrimCache);
 		}
 	}
-	new CurrentScrimHydrationStore().listen();
-</script>
+	
+
+	onMount(() => {
+		currentScrimHydration.listen();
+		pendingScrimsHydration.listen();
+
+		return () => {
+			currentScrimHydration.unlisten()
+			currentScrimHydration.unlisten()
+		}
+	})
+	</script>
 
 {#if !$ScrimPageRoot.data}
 	Loading...
@@ -26,7 +39,7 @@
 	<section class="card p-4 col-span-full">
 		<p class="text-xl font-bold text-center">You are not registered as a player for any games, and cannot scrim.</p>
 	</section>
-{:else if $ScrimPageRoot.data?.currentScrim}
+{:else if $ScrimPageRoot.data?.currentScrim && !$ScrimPageRoot.data.currentScrim.complete}
 	<!-- User is currently in a scrim -->
 	<ScrimFlow
 		pendingScrims={$ScrimPageRoot.data.pendingScrims}
diff --git a/clients/web/src/routes/(app)/scrims/ScrimList.svelte b/clients/web/src/routes/(app)/scrims/ScrimList.svelte
index 07ab13b5..0940f6e0 100644
--- a/clients/web/src/routes/(app)/scrims/ScrimList.svelte
+++ b/clients/web/src/routes/(app)/scrims/ScrimList.svelte
@@ -24,7 +24,10 @@
 			Create Scrim
 		</button>
 	</header>
-	{#each pendingScrims ?? [] as scrim}
+	{#each pendingScrims?.filter(p => {
+		console.log(Object.keys(p))
+		return !p.complete
+	}) ?? [] as scrim}
 		<ScrimListItem pendingScrim={scrim} />
 	{:else}
 		There are currently no active scrims
diff --git a/clients/web/src/routes/(app)/scrims/ScrimListItem.svelte b/clients/web/src/routes/(app)/scrims/ScrimListItem.svelte
index e459530b..107bf71d 100644
--- a/clients/web/src/routes/(app)/scrims/ScrimListItem.svelte
+++ b/clients/web/src/routes/(app)/scrims/ScrimListItem.svelte
@@ -12,9 +12,4 @@
 		<p>Current Participants: {$scrim.participantCount} / {$scrim.gameMode.playerCount}</p>
 		<p>State: {$scrim.state}</p>
 	</SubjectBox>
-	<div>
-		<p>ScrimId: {$scrim.id}</p>
-		<p>ParticipantCount: {$scrim.participantCount}</p>
-		<p>ParticipantCount: {$scrim.participantCount}</p>
-	</div>
 {/if}