diff --git a/server.py b/server.py
index 7e4da7cab7f779d6e27ef81324b3ffc64e39ce6b..7e58debd5ea0cc5b43f466b2067cb9a10d1d4a81 100644
--- a/server.py
+++ b/server.py
@@ -224,12 +224,11 @@ def lecture(id):
 	videos = query('''
 			SELECT videos.*, (videos.downloadable AND courses.downloadable) as downloadable, formats.description AS format_description, formats.player_prio, formats.prio
 			FROM videos
-			JOIN lectures ON (videos.lecture_id = lectures.id)
 			JOIN formats ON (videos.video_format = formats.id)
-			JOIN courses ON (lectures.course_id = courses.id)
-			WHERE lectures.course_id= ? AND (? OR videos.visible)
-			ORDER BY lectures.time, formats.prio DESC
-			''', lecture['course_id'], ismod())
+			JOIN courses ON (courses.id = ?)
+			WHERE videos.lecture_id = ? AND (? OR videos.visible)
+			ORDER BY formats.prio DESC
+			''', lecture['course_id'], lecture['id'], ismod())
 	if not videos:
 		flash('Zu dieser Vorlesung wurden noch keine Videos veröffentlicht!')
 	course = query('SELECT * FROM courses WHERE id = ? AND (? OR (visible AND listed))', lecture['course_id'], ismod())