diff --git a/panikweb/views.py b/panikweb/views.py
index 7e9aa5bb3cd34523f4cddcc844c23faf5665f55f..92f47a626cb7e736f16f3cb84deb4614838eeb7b 100644
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -233,6 +233,14 @@ def onair(request):
             'title': d['emission'].title,
             'url': d['emission'].get_absolute_url()
         }
+    if d.get('nonstop'):
+        d['nonstop'] = {
+            'title': d['nonstop'].title,
+        }
+    if d.get('current_slot'):
+        d['current_slot'] = {
+            'title': d['current_slot'].title
+        }
     return d
 
 
diff --git a/panikweb_templates/templates/includes/player.html b/panikweb_templates/templates/includes/player.html
index a6deaae09150b8dcf8a4d359da2ace0dc1accbeb..208d5ebe615038bbe2057816ef5f79a27c76a130 100644
--- a/panikweb_templates/templates/includes/player.html
+++ b/panikweb_templates/templates/includes/player.html
@@ -43,6 +43,9 @@
 								result = result + ($.type(onair.data.emission) == 'object'?'<strong>'+onair.data.emission.title+'</strong>&nbsp;':'');
 								result = result +  ($.type(onair.data.episode) == 'object'?'<span>'+onair.data.episode.title+'</span>':'');
 								WhatsOnAir.html(result);
+							} else if (onair.data.nonstop) {
+								result = onair.data.nonstop.title;
+								WhatsOnAir.html('<strong>' + result + '</strong>');
 							}
 							else{WhatsOnAir.html('<strong>Unknown (Probably Non-Stop)</strong>');}
 							WhatsOnAir.fadeIn();