diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Tags.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Tags.tsx
index ea808f9df..553e00a61 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Tags.tsx
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Tags.tsx
@@ -7,7 +7,7 @@ interface IProps {
 }
 
 export const Tags = (props: IProps) => {
-    return props.tags.length > 0
+    return props.tags && props.tags.length > 0
                ? <div className="d-md-none">
                      {props.tags.map((t: IListTagDto, i: number) => <Tag {...t} key={i}/>)}
                  </div>
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainersInfoCard.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainersInfoCard.tsx
index c8e69d51c..33e7b77d6 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainersInfoCard.tsx
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainersInfoCard.tsx
@@ -7,7 +7,7 @@ interface IProps {
 }
 
 export const MaintainersInfoCard = (props: IProps) => {
-    return props.maintainers.length > 0
+    return props.maintainers && props.maintainers.length > 0
                ? <div className="w-100">
                      {props.maintainers.map(
                          (m: IListMaintainerDto, i: number) => <MaintainerInfoCard {...m} key={i}/>)}