diff --git a/packages/design-system/organisms/app-shell/AppShell.tsx b/packages/design-system/organisms/app-shell/AppShell.tsx
index bfb2e94..7154d57 100644
--- a/packages/design-system/organisms/app-shell/AppShell.tsx
+++ b/packages/design-system/organisms/app-shell/AppShell.tsx
@@ -27,7 +27,7 @@ export const AppShell = (props: AppShellProps) => (
                 guilds={props.guilds || []}
                 activeGuildId={props.activeGuildId || null}
                 user={props.user}
-                recentGuilds={props.recentGuilds}
+                recentGuilds={props.recentGuilds || []}
             />
         ) : (
             <Masthead.Guest />
diff --git a/packages/design-system/templates/servers/Servers.tsx b/packages/design-system/templates/servers/Servers.tsx
index 6fd476b..71b6574 100644
--- a/packages/design-system/templates/servers/Servers.tsx
+++ b/packages/design-system/templates/servers/Servers.tsx
@@ -7,8 +7,8 @@ type ServerTemplateProps = Omit<AppShellProps, 'children'>;
 export const ServersTemplate = (props: ServerTemplateProps) => (
     <AppShell {...props} disableGuildPicker>
         <ServersListing
-            guilds={props.guilds}
-            recentGuilds={props.recentGuilds}
+            guilds={props.guilds || []}
+            recentGuilds={props.recentGuilds || []}
         ></ServersListing>
     </AppShell>
 );