diff --git a/client/src/javascript/components/sidebar/NotificationsButton.tsx b/client/src/javascript/components/sidebar/NotificationsButton.tsx
index 154d81df8..fc8deb41a 100644
--- a/client/src/javascript/components/sidebar/NotificationsButton.tsx
+++ b/client/src/javascript/components/sidebar/NotificationsButton.tsx
@@ -63,15 +63,14 @@ const NotificationTopToolbar: FC<NotificationTopToolbarProps> = ({
 };
 
 interface NotificationItemProps {
-  index: number;
   notification: Notification;
 }
 
-const NotificationItem: FC<NotificationItemProps> = ({index, notification}: NotificationItemProps) => {
+const NotificationItem: FC<NotificationItemProps> = ({notification}: NotificationItemProps) => {
   const {i18n} = useLingui();
 
   return (
-    <li className="notifications__list__item" key={index}>
+    <li className="notifications__list__item">
       <div className="notification__heading">
         <span className="notification__category">{i18n._(`${notification.id}.heading`)}</span>
         {' — '}
@@ -195,7 +194,7 @@ const NotificationsButton: FC = observer(() => {
               style={{minHeight: prevHeight}}
             >
               {notifications.map((notification, index) => (
-                <NotificationItem index={index} notification={notification} />
+                <NotificationItem key={index} notification={notification} />
               ))}
             </ul>
             <NotificationBottomToolbar
diff --git a/client/src/javascript/components/sidebar/SidebarFilter.tsx b/client/src/javascript/components/sidebar/SidebarFilter.tsx
index 35cb29a0d..49ce599f0 100644
--- a/client/src/javascript/components/sidebar/SidebarFilter.tsx
+++ b/client/src/javascript/components/sidebar/SidebarFilter.tsx
@@ -63,7 +63,7 @@ const SidebarFilter: FC<SidebarFilterProps> = ({
         {icon}
         <span className="name">{name}</span>
         <Badge>{count}</Badge>
-        {size && <Size value={size} className="size" />}
+        {size != null && <Size value={size} className="size" />}
       </button>
     </li>
   );