diff --git a/apps/client/src/features/info/InfoNif.tsx b/apps/client/src/features/info/InfoNif.tsx
index 3b33aba7c..19a0567df 100644
--- a/apps/client/src/features/info/InfoNif.tsx
+++ b/apps/client/src/features/info/InfoNif.tsx
@@ -15,7 +15,7 @@ export default function InfoNif() {
 
   return (
     <div className={style.interfaceList}>
-      {data?.networkInterfaces.map((nif) => (
+      {data?.networkInterfaces?.map((nif) => (
         <span key={nif.address} onClick={() => handleClick(nif.address)} className={style.interface}>
           {`${nif.name} - ${nif.address}`}
           <IoArrowUp className={style.linkIcon} />
diff --git a/apps/client/src/features/rundown/Rundown.tsx b/apps/client/src/features/rundown/Rundown.tsx
index 386e1051d..5fc711907 100644
--- a/apps/client/src/features/rundown/Rundown.tsx
+++ b/apps/client/src/features/rundown/Rundown.tsx
@@ -194,7 +194,7 @@ export default function Rundown(props: RundownProps) {
     }
   };
 
-  if (!entries.length) {
+  if (statefulEntries?.length < 1) {
     return <RundownEmpty handleAddNew={() => insertAtCursor(SupportedEvent.Event, -1)} />;
   }