diff --git a/app/(home-pages)/notifications/NotificationList.tsx b/app/(home-pages)/notifications/NotificationList.tsx
index 1f1d1fb5..da3fd115 100644
--- a/app/(home-pages)/notifications/NotificationList.tsx
+++ b/app/(home-pages)/notifications/NotificationList.tsx
@@ -19,6 +19,13 @@ export function NotificationList({
   let { rootEntity } = useReplicache();
   let cardBorderHidden = useEntity(rootEntity, "theme/card-border-hidden")?.data
     .value;
+
+  if (notifications.length === 0)
+    return (
+      <div className="w-full container italic text-tertiary text-center sm:p-4 p-3">
+        no notifications yet...
+      </div>
+    );
   return (
     <div className="max-w-prose mx-auto w-full">
       <div className={`flex flex-col ${cardBorderHidden ? "gap-6" : "gap-2"}`}>
diff --git a/components/ActionBar/Navigation.tsx b/components/ActionBar/Navigation.tsx
index 0ff4240e..8edb9a1a 100644
--- a/components/ActionBar/Navigation.tsx
+++ b/components/ActionBar/Navigation.tsx
@@ -26,6 +26,7 @@ import {
   markAsRead,
 } from "app/(home-pages)/notifications/getNotifications";
 import { DotLoader } from "components/utils/DotLoader";
+import { NotificationList } from "app/(home-pages)/notifications/NotificationList";
 
 export type navPages = "home" | "reader" | "pub" | "discover" | "notifications";
 
@@ -203,33 +204,24 @@ export function NotificationButton(props: { current?: boolean }) {
         />
       }
     >
-      <div className="flex flex-col gap-5 text-sm">
-        {isLoading ? (
-          <div className="flex items-center justify-center gap-1 text-tertiary italic text-sm mt-8">
-            <span>loading</span>
-            <DotLoader />
-          </div>
-        ) : (
-          notifications?.map((n) => {
-            if (n.type === "comment") {
-              n;
-              return (
-                <CommentNotification
-                  cardBorderHidden={true}
-                  key={n.id}
-                  {...n}
-                />
-              );
-            }
-          })
-        )}
-      </div>
-      <SpeedyLink
-        className="flex justify-end pt-2 text-sm"
-        href={"/notifications"}
-      >
-        See All
-      </SpeedyLink>
+      {isLoading ? (
+        <div className="flex items-center justify-center gap-1 text-tertiary italic text-sm p-3 sm:p-4">
+          <span>loading</span>
+          <DotLoader />
+        </div>
+      ) : (
+        <>
+          <NotificationList notifications={notifications!} />
+          {notifications && notifications.length > 0 && (
+            <SpeedyLink
+              className="flex justify-end pt-2 text-sm"
+              href={"/notifications"}
+            >
+              See All
+            </SpeedyLink>
+          )}
+        </>
+      )}
     </Popover>
   );
 }