diff --git a/src/FilterLists.Web/src/components/Maintainers.tsx b/src/FilterLists.Web/src/components/Maintainers.tsx
index 51f3d5928..25e26dbc9 100644
--- a/src/FilterLists.Web/src/components/Maintainers.tsx
+++ b/src/FilterLists.Web/src/components/Maintainers.tsx
@@ -20,29 +20,39 @@ interface MaintainerComponentProps {
   maintainer: Maintainer;
 }
 
-const MaintainerComponent = (props: MaintainerComponentProps) =>
-  <Card
-    title={props.maintainer.name}
-    actions={[
-      props.maintainer.homeUrl &&
+const MaintainerComponent = (props: MaintainerComponentProps) => {
+  let actions = [];
+  if (props.maintainer.homeUrl) {
+    actions.push(
       <a href={props.maintainer.homeUrl}
         title={`View ${props.maintainer.name}'s homepage.`}
         target="_blank"
         rel="noopener noreferrer">
         <Icon type="home" key="home" />
-      </a>,
-      props.maintainer.emailAddress &&
+      </a>
+    );
+  }
+  if (props.maintainer.emailAddress) {
+    actions.push(
       <a href={`mailto:${props.maintainer.emailAddress}`}
         title={`Email ${props.maintainer.name}.`}
         target="_blank"
         rel="noopener noreferrer">
         <Icon type="mail" key="mail" />
-      </a>,
-      props.maintainer.twitterHandle &&
+      </a>
+    );
+  }
+  if (props.maintainer.twitterHandle) {
+    actions.push(
       <a href={`https://twitter.com/${props.maintainer.twitterHandle}`}
         title={`${props.maintainer.twitterHandle} on Twitter`}
         target="_blank"
         rel="noopener noreferrer">
         <Icon type="twitter" key="twitter" />
       </a>
-    ]} />;
\ No newline at end of file
+    );
+  }
+  return <Card
+    title={props.maintainer.name}
+    actions={actions} />;
+}
\ No newline at end of file