diff --git a/packages/atoms/EventTypeList/EventTypeList.tsx b/packages/atoms/EventTypeList/EventTypeList.tsx
index 54b8e268a2..05653dfe62 100644
--- a/packages/atoms/EventTypeList/EventTypeList.tsx
+++ b/packages/atoms/EventTypeList/EventTypeList.tsx
@@ -1,4 +1,25 @@
-export function EventTypeList() {
+import { CreateFirstEventTypeView } from "EventTypeList/components/empty-screen/createFirstEventType";
+import { EmptyEventTypeList } from "EventTypeList/components/empty-screen/emptyEventTypeList";
+
+export function EventTypeList({
+  group,
+  groupIndex,
+  readOnly,
+  types,
+}: {
+  group: any;
+  groupIndex: number;
+  readOnly: boolean;
+  types: any;
+}): JSX.Element {
+  if (!types.length) {
+    return group.teamId ? (
+      <EmptyEventTypeList group={group} />
+    ) : (
+      <CreateFirstEventTypeView slug={group.profile.slug ?? ""} />
+    );
+  }
+
   return (
     <div>
       <h1>Event type list goes here</h1>