diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
index 14ad1bcb7b7461dad8e0648e5fc00e2c039c5e88..80c6238eb7d57a5741bfcc2f4f09328c37edc305 100644
--- a/app/controllers/assignments_controller.rb
+++ b/app/controllers/assignments_controller.rb
@@ -4,7 +4,7 @@ class AssignmentsController < ApplicationController
   before_action :set_session, :set_users
 
   def index
-    @assignments = Assignment.all
+    @assignments = Assignment.all.joins(:session, :user).order('sessions.starts_at')
     if params[:user_id]
       @assignments = @assignments.where(user_id: params[:user_id])
     end