diff --git a/zero.Web/ViewHelpers/ZeroMediaHelper.cs b/zero.Web/ViewHelpers/ZeroMediaHelper.cs
index bde03c93..1ca04d41 100644
--- a/zero.Web/ViewHelpers/ZeroMediaHelper.cs
+++ b/zero.Web/ViewHelpers/ZeroMediaHelper.cs
@@ -68,6 +68,11 @@ public class ZeroMediaHelper : IZeroMediaHelper
 
     foreach (string id in ids)
     {
+      if (id.IsNullOrEmpty())
+      {
+        continue;
+      }
+
       if (Cache.TryGetValue(id, out Media.Media media))
       {
         items.TryAdd(id, media);
@@ -94,6 +99,13 @@ public class ZeroMediaHelper : IZeroMediaHelper
       }
     }
 
+    IEnumerable<string> failedIds = ids.Where(x => x.HasValue()).Where(id => !items.ContainsKey(id));
+
+    foreach (string id in failedIds)
+    {
+      items.Add(id, null);
+    }
+
     return items;
   }