diff --git a/templates/components/MonitorListRow.html.twig b/templates/components/MonitorListRow.html.twig
index 12f12b1..8da28e4 100644
--- a/templates/components/MonitorListRow.html.twig
+++ b/templates/components/MonitorListRow.html.twig
@@ -3,14 +3,14 @@
    imdb-id="{{ monitor.imdbId }}"
    media-title="{{ monitor.title }}"
    season="{{ monitor.season }}"
-   episode="{{ monitor.episode }}"
+   episode="{{ monitor.episode ?? '-' }}"
    status="{{ monitor.status }}"
    search-count="{{ monitor.searchCount }}"
    media-type="{{ monitor.monitorType|monitor_type }}"
    episode-id="{{ monitor|monitor_media_id }}"
    created-at="{{ monitor.createdAt|date('m/d/Y g:i a') }}"
    last-search="{{ monitor.lastSearch|date('m/d/Y g:i a') }}"
-   downloaded-at="{{ monitor.downloadedAt|date('m/d/Y g:i a') }}"
+   downloaded-at="{{null != monitor.downloadedAt ? monitor.downloadedAt|date('m/d/Y g:i a') : '-' }}"
 >
     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 truncate">
         <a href="{{ path('app_search_result', {imdbId: monitor.imdbId, mediaType: monitor.monitorType|as_download_type}) }}"