diff --git a/UI/Calendar/UpcomingItemTemplate.html b/UI/Calendar/UpcomingItemTemplate.html
index f8b4a8ee9..af4490153 100644
--- a/UI/Calendar/UpcomingItemTemplate.html
+++ b/UI/Calendar/UpcomingItemTemplate.html
@@ -3,9 +3,11 @@
         <h1>{{Day airDate}}</h1>
         <h4>{{Month airDate}}</h4>
     </div>
-    <a href="{{series.route}}">
-        <h4>{{series.title}}</h4>
+    {{#with series}}
+    <a href="{{route}}">
+        <h4>{{title}}</h4>
     </a>
+    {{/with}}
     <p>{{StartTime airDate}} {{ShortDate airDate}}<span class="pull-right">{{seasonNumber}}x{{Pad2 episodeNumber}}</span><br>{{episodeTitle}}</p>
     <p class="episode-title x-episode-title">{{title}}</p>
 </div>
diff --git a/UI/Episode/LayoutTemplate.html b/UI/Episode/LayoutTemplate.html
index 7cbe5ba2b..6feb72a83 100644
--- a/UI/Episode/LayoutTemplate.html
+++ b/UI/Episode/LayoutTemplate.html
@@ -22,7 +22,9 @@
     </div>
     <div class="modal-footer">
         {{#unless hideSeriesLink}}
-            <a href="{{series.route}}" class="btn pull-left" data-dismiss="modal">open series</a>
+            {{#with series}}
+                <a href="{{route}}" class="btn pull-left" data-dismiss="modal">open series</a>
+            {{/with}}
         {{/unless}}
 
         <button class="btn" data-dismiss="modal">close</button>