diff --git a/src/components/NewUI/EventStream.tsx b/src/components/NewUI/EventStream.tsx
index 51608d9..1eed189 100644
--- a/src/components/NewUI/EventStream.tsx
+++ b/src/components/NewUI/EventStream.tsx
@@ -3,13 +3,9 @@ import Event, { IEvent } from './Event';
 export default function EventStream({ events }: { events: IEvent[] }) {
 	return (
 		<div style={{ display: 'flex', flexDirection: 'column', width: '100%' }}>
-			{events && events.length > 0 ? (
-				events.map((event) => <Event {...event} key={event.name} />)
-			) : (
-				<span>
-					There are no events yet. Click 'create event' above to add one!
-				</span>
-			)}
+			{events.map((event) => (
+				<Event {...event} key={event.name} />
+			))}
 		</div>
 	);
 }
diff --git a/src/components/NewUI/Group.tsx b/src/components/NewUI/Group.tsx
index 46e4774..acb6c43 100644
--- a/src/components/NewUI/Group.tsx
+++ b/src/components/NewUI/Group.tsx
@@ -65,7 +65,13 @@ export default function Group() {
 			<br />
 			<EventCreatorLink group={group} />
 			<br />
-			<EventStream events={events} />
+			{events && events.length > 0 ? (
+				<EventStream events={events} />
+			) : (
+				<span>
+					There are no events yet. Click 'create event' above to add one!
+				</span>
+			)}
 		</div>
 	);
 }