diff --git a/src/components/AccountNotifications.tsx b/src/components/AccountNotifications.tsx
index 518e94d86..5d9f1552a 100644
--- a/src/components/AccountNotifications.tsx
+++ b/src/components/AccountNotifications.tsx
@@ -101,26 +101,28 @@ export const AccountNotifications: FC<IAccountNotifications> = (
         </div>
       )}
 
-      {showAccountNotifications
-        ? groupByRepository
-          ? Object.values(groupedNotifications).map((repoNotifications) => {
-              const repoSlug = repoNotifications[0].repository.full_name;
+      {showAccountNotifications && (
+        <>
+          {groupByRepository
+            ? Object.values(groupedNotifications).map((repoNotifications) => {
+                const repoSlug = repoNotifications[0].repository.full_name;
 
-              return (
-                <RepositoryNotifications
-                  key={repoSlug}
-                  repoName={repoSlug}
-                  repoNotifications={repoNotifications}
+                return (
+                  <RepositoryNotifications
+                    key={repoSlug}
+                    repoName={repoSlug}
+                    repoNotifications={repoNotifications}
+                  />
+                );
+              })
+            : notifications.map((notification) => (
+                <NotificationRow
+                  key={notification.id}
+                  notification={notification}
                 />
-              );
-            })
-          : notifications.map((notification) => (
-              <NotificationRow
-                key={notification.id}
-                notification={notification}
-              />
-            ))
-        : null}
+              ))}
+        </>
+      )}
     </>
   );
 };
diff --git a/src/components/icons/AuthMethodIcon.tsx b/src/components/icons/AuthMethodIcon.tsx
index 85021bfbf..90251bd79 100644
--- a/src/components/icons/AuthMethodIcon.tsx
+++ b/src/components/icons/AuthMethodIcon.tsx
@@ -11,11 +11,9 @@ export interface IAuthMethodIcon {
 export const AuthMethodIcon: FC<IAuthMethodIcon> = (props: IAuthMethodIcon) => {
   return (
     <span title={props.type} className="mr-1">
-      {props.type === 'GitHub App' ? <AppsIcon size={props.size} /> : null}
-      {props.type === 'Personal Access Token' ? (
-        <KeyIcon size={props.size} />
-      ) : null}
-      {props.type === 'OAuth App' ? <PersonIcon size={props.size} /> : null}
+      {props.type === 'GitHub App' && <AppsIcon size={props.size} />}
+      {props.type === 'Personal Access Token' && <KeyIcon size={props.size} />}
+      {props.type === 'OAuth App' && <PersonIcon size={props.size} />}
     </span>
   );
 };
diff --git a/src/components/icons/PlatformIcon.tsx b/src/components/icons/PlatformIcon.tsx
index 3fb341045..7fb50501c 100644
--- a/src/components/icons/PlatformIcon.tsx
+++ b/src/components/icons/PlatformIcon.tsx
@@ -11,12 +11,10 @@ export interface IPlatformIcon {
 export const PlatformIcon: FC<IPlatformIcon> = (props: IPlatformIcon) => {
   return (
     <span title={props.type} className="mr-1">
-      {props.type === 'GitHub Cloud' ? (
-        <MarkGithubIcon size={props.size} />
-      ) : null}
-      {props.type === 'GitHub Enterprise Server' ? (
+      {props.type === 'GitHub Cloud' && <MarkGithubIcon size={props.size} />}
+      {props.type === 'GitHub Enterprise Server' && (
         <ServerIcon size={props.size} />
-      ) : null}
+      )}
     </span>
   );
 };