diff --git a/resources/lib/modules/iptvmanager.py b/resources/lib/modules/iptvmanager.py
index 9fc0b16..38f4053 100644
--- a/resources/lib/modules/iptvmanager.py
+++ b/resources/lib/modules/iptvmanager.py
@@ -79,7 +79,7 @@ def send_epg(self):  # pylint: disable=no-method-argument
                             'stop': (program.start + timedelta(seconds=program.duration)).isoformat(),
                             'title': program.program_title,
                             'subtitle': program.episode_title,
-                            'description': program.description,
+                            'description': program.description or program.program_description,
                             'episode': 'S%sE%s' % (program.season, program.number) if program.season and program.number else None,
                             'genre': program.genre,
                             'genre_id': program.genre_id,
diff --git a/resources/lib/play/epg.py b/resources/lib/play/epg.py
index d2f6def..6bedc22 100644
--- a/resources/lib/play/epg.py
+++ b/resources/lib/play/epg.py
@@ -133,17 +133,16 @@ def _parse_program(channel, data):
         :type data: dict
         :rtype EpgProgram
         """
+        airing = False
         duration = int(data['program']['duration']) if data['program']['duration'] else None
         # Check if this broadcast is currently airing
         timestamp = datetime.now().replace(tzinfo=dateutil.tz.gettz('CET'))
         start = datetime.fromtimestamp(data['program']['timestamp']).replace(tzinfo=dateutil.tz.gettz('CET'))
         if duration:
             airing = bool(start <= timestamp < (start + timedelta(seconds=duration)))
-        else:
-            airing = False
 
         # Only allow direct playing if the linked video is the actual program
-        if data['program']['video']:
+        if data['program']['latestVideo']:
             video_url = data['program']['video']['uuid']
             thumb = data['program']['video']['data']['images']['default']
         else: