diff --git a/apps/web/components/Celebration.tsx b/apps/web/components/Celebration.tsx
index dd4dfb4b3..d42cc07f2 100644
--- a/apps/web/components/Celebration.tsx
+++ b/apps/web/components/Celebration.tsx
@@ -4,7 +4,7 @@ import Image from "next/image";
 import { getCelebrationImage } from "@/utils/celebration";
 import { Button } from "@/components/Button";
 
-export function Celebration(props: { message: string }) {
+export function Celebration(props: { type: string }) {
   const [active, setActive] = useState(false);
 
   useEffect(() => {
@@ -14,47 +14,59 @@ export function Celebration(props: { message: string }) {
   return (
     <>
       <div className="mt-20 flex items-center justify-center font-cal text-2xl text-gray-900">
-        Congrats! {props.message}
-      </div>
-      <div className="flex items-center justify-center">
-        <Confetti
-          active={active}
-          config={{
-            duration: 5_000,
-            elementCount: 500,
-            spread: 200,
-          }}
-        />
+        {props.type === "inbox"
+          ? "You made it to Inbox Zero!"
+          : props.type === "draft"
+            ? "You don't have any saved drafts."
+            : props.type === "sent"
+              ? "You haven't sent any emails yet."
+              : props.type === "archive"
+                ? "No emails have been archived."
+                : "All emails handled!"}
       </div>
+      {props.type === "inbox" && (
+        <>
+          <div className="flex items-center justify-center">
+            <Confetti
+              active={active}
+              config={{
+                duration: 5_000,
+                elementCount: 500,
+                spread: 200,
+              }}
+            />
+          </div>
 
-      <div className="mt-8 flex justify-center">
-        <Button
-          size="2xl"
-          onClick={() => {
-            const tweet = encodeURIComponent(
-              "I made it to Inbox Zero thanks to @inboxzero_ai!",
-            );
-            const twitterIntentURL = `https://x.com/intent/tweet?text=${tweet}`;
-            window.open(
-              twitterIntentURL,
-              "_blank",
-              "noopener,noreferrer,width=550,height=420",
-            );
-          }}
-        >
-          Share on Twitter
-        </Button>
-      </div>
+          <div className="mt-8 flex justify-center">
+            <Button
+              size="2xl"
+              onClick={() => {
+                const tweet = encodeURIComponent(
+                  "I made it to Inbox Zero thanks to @inboxzero_ai!",
+                );
+                const twitterIntentURL = `https://x.com/intent/tweet?text=${tweet}`;
+                window.open(
+                  twitterIntentURL,
+                  "_blank",
+                  "noopener,noreferrer,width=550,height=420",
+                );
+              }}
+            >
+              Share on Twitter
+            </Button>
+          </div>
 
-      <div className="mt-8 flex items-center justify-center">
-        <Image
-          src={getCelebrationImage()}
-          width={400}
-          height={400}
-          alt="Congrats!"
-          unoptimized
-        />
-      </div>
+          <div className="mt-8 flex items-center justify-center">
+            <Image
+              src={getCelebrationImage()}
+              width={400}
+              height={400}
+              alt="Congrats!"
+              unoptimized
+            />
+          </div>
+        </>
+      )}
     </>
   );
 }
diff --git a/apps/web/components/email-list/EmailList.tsx b/apps/web/components/email-list/EmailList.tsx
index b5a9916eb..7bef3e7bd 100644
--- a/apps/web/components/email-list/EmailList.tsx
+++ b/apps/web/components/email-list/EmailList.tsx
@@ -131,13 +131,7 @@ export function List(props: {
           refetch={refetch}
         />
       ) : (
-        <Celebration
-          message={
-            props.type === "inbox"
-              ? "You made it to Inbox Zero!"
-              : "All emails handled!"
-          }
-        />
+        <Celebration type={props.type!} />
       )}
     </>
   );