diff --git a/API/Data.MSSQL/Repositories/ShiftRepository.cs b/API/Data.MSSQL/Repositories/ShiftRepository.cs
index f1cc936..1c63f58 100644
--- a/API/Data.MSSQL/Repositories/ShiftRepository.cs
+++ b/API/Data.MSSQL/Repositories/ShiftRepository.cs
@@ -50,21 +50,23 @@ public void Delete(int id, int organizationId)
 
         public IEnumerable<Shift> ReadFromOrganization(string organizationShortKey)
         {
-            var shifts = _context.Shifts
-                .Where(x => x.Organization.ShortKey == organizationShortKey).ToList();
-            return shifts;
+            return _context.Shifts
+                .Where(x => x.Organization.ShortKey == organizationShortKey)
+                .OrderBy(s => s.Start);
         }
 
         public Shift Read(int id, int organizationId)
         {
-            return _context.Shifts.FirstOrDefault(x => x.Id == id && x.Organization.Id == organizationId);
+            return _context.Shifts
+                .FirstOrDefault(x => x.Id == id && x.Organization.Id == organizationId);
         }
 
         public IEnumerable<Shift> ReadFromOrganization(int organizationId)
         {
             return _context.Shifts
                 .Where(x => x.Organization.Id == organizationId)
-                .Include(x => x.Employees.Select(e => e.Roles));
+                .Include(x => x.Employees.Select(e => e.Roles))
+                .OrderBy(s => s.Start);
         }
 
         public int Update(Shift shift)