diff --git a/src/lib/components/mainLayout.svelte b/src/lib/components/mainLayout.svelte
index 6fc00ac..47ff98e 100644
--- a/src/lib/components/mainLayout.svelte
+++ b/src/lib/components/mainLayout.svelte
@@ -7,15 +7,9 @@
   import ModeSwitcher from './modeSwitcher.svelte';
 
   interface Props {
-    data: SuperValidated<
-      {
-        channelName: string;
-      },
-      any,
-      {
-        channelName: string;
-      }
-    >;
+    data: SuperValidated<{
+      channelName: string;
+    }>;
     channels: string[];
     children: Snippet;
   }
diff --git a/src/routes/channel/[channel]/+page.svelte b/src/routes/channel/[channel]/+page.svelte
index c636d42..e03fa5b 100644
--- a/src/routes/channel/[channel]/+page.svelte
+++ b/src/routes/channel/[channel]/+page.svelte
@@ -51,7 +51,7 @@
 {/snippet}
 <div class="flex h-full flex-1 flex-col items-center justify-center gap-1 rounded-lg shadow-sm">
   <div class="flex w-full flex-auto flex-grow flex-col-reverse overflow-x-hidden overflow-y-scroll rounded-lg border">
-    {@render message(socket?.messages!)}
+    {@render message(socket?.messages ?? [])}
     {@render message(data.messages)}
   </div>
   <form