diff --git a/server.py b/server.py
index f14e2d96ec9ddd4f68de1244d19659a4e8e111d1..e5f4441849c6a64b368388b69d15a3b1cdf13e83 100644
--- a/server.py
+++ b/server.py
@@ -337,9 +337,10 @@ def index():
 	start = date.today()
 	end = start + timedelta(days=7)
 	upcomming = query('''
-		SELECT lectures.*, "course" AS sep, courses.*
+		SELECT lectures.*, streams.active AS nowlive, "course" AS sep, courses.*
 		FROM lectures
 		JOIN courses ON (lectures.course_id = courses.id)
+		LEFT JOIN streams ON lectures.id = streams.lecture_id
 		WHERE (time > ?) AND (time < ?) AND (? OR (lectures.visible AND courses.visible AND courses.listed)) AND NOT lectures.norecording
 		ORDER BY time ASC LIMIT 30''', start, end, ismod())
 	for i in upcomming:
diff --git a/templates/index.html b/templates/index.html
index 70b72bf0971752f5b2c93093936a067a29df8f05..60e282695d1d90f3240f998f38b9116b0ace0ebe 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -111,7 +111,7 @@
 							<ul class="list-group" style="margin: 0px;">
 								{% for i in g.list %}
 								<li class="list-group-item list-group-item-condensed">
-									{{i.time|time}} <a href="{{url_for('course', handle=i.course.handle)}}">{{i.course.title}}</a>: <a href="{{url_for('course', handle=i.course.handle)}}#lecture-{{i.id}}">{{i.title}}</a> {{livelabel(i.live, False)}}
+									{{i.time|time}} <a href="{{url_for('course', handle=i.course.handle)}}">{{i.course.title}}</a>: <a href="{{url_for('course', handle=i.course.handle)}}#lecture-{{i.id}}">{{i.title}}</a> {{livelabel(i.live, i.nowlive)}}
 								</li>
 								{% endfor %}
 							</ul>