diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index ecc8b9b6..1d7ca3fd 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -390,8 +390,8 @@
 
     <string id="39045">Appearance Tweaks</string>
     <string id="39046">TV Shows</string>
-    <string id="39047">On Deck view: Append show title to episode</string>
-    <string id="39048">On Deck view: Append season number to episode</string>
+    <string id="39047">On Deck: Append show title to episode</string>
+    <string id="39048">On Deck: Append season- and episode-number (e.g. S3E2)</string>
 
 
     <!-- Plex Entrypoint.py -->
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index 78b3de85..6b3361fa 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -327,7 +327,7 @@
     <string id="39045">Erscheinung</string>
     <string id="39046">TV Serien</string>
     <string id="39047">"Aktuell": Serien- an Episoden-Titel anfügen</string>
-    <string id="39048">"Aktuell": Staffel an Episoden-Titel anfügen</string>
+    <string id="39048">"Aktuell": Staffel und Episode anfügen (z.B. S3E2)</string>
 
     <!-- Plex Entrypoint.py -->
     <string id="39200">Plex Home Benutzer wechseln</string>
diff --git a/resources/lib/entrypoint.py b/resources/lib/entrypoint.py
index b674af60..5a384d51 100644
--- a/resources/lib/entrypoint.py
+++ b/resources/lib/entrypoint.py
@@ -1447,11 +1447,13 @@ def getOnDeck(viewid, mediatype, tagname, limit):
             # There will always be only 1 episode ('limit=1')
             li = createListItem(episode)
             # Fix some skin shortcomings
-            title = episode['title']
+            title = episode.get('title', '')
             if utils.settings('OnDeckTvAppendSeason') == 'true':
-                season = episode.get('season')
-                if season:
-                    title = str(season) + ' - ' + title
+                seasonid = episode.get('season')
+                episodeid = episode.get('episode')
+                if seasonid and episodeid:
+                    title = ('S' + str(seasonid) + 'E' + str(episodeid)
+                             + ' - ' + title)
             if utils.settings('OnDeckTvAppendShow') == 'true':
                 show = episode.get('showtitle')
                 if show: