diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index 4be65dda..6f422c32 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -119,7 +119,7 @@ function Shifts_by_ShiftsFilter(ShiftsFilter $shiftsFilter)
       AND `NeededAngelTypes`.`count` > 0
       AND NOT `Shifts`.`PSID` IS NULL) AS tmp_shifts
 
-      ORDER BY `start`';
+      ORDER BY `room_name`, `start`';
 
     return DB::select(
         $sql,